--- a/Messaging/Server/Server.csproj	Wed Mar 21 15:39:53 2012 +0000
+++ b/Messaging/Server/Server.csproj	Wed Mar 21 19:00:59 2012 +0000
@@ -57,6 +57,10 @@
     <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\Libs\Elysium.Theme.1.3\Microsoft.Windows.Shell.dll</HintPath>
     </Reference>
+    <Reference Include="RabbitMQ.Client, Version=2.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Libs\RabbitMq.2.6.1.0\RabbitMQ.Client.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\Libs\Elysium.Theme.1.3\System.Windows.Interactivity.dll</HintPath>
@@ -76,11 +80,15 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Converters\ToggleButtonToTextConverter.cs" />
+    <Compile Include="EndPoints\RabbitEndPoint.cs" />
+    <Compile Include="EndPoints\RabbitProtoEndPoint.cs" />
+    <Compile Include="EndPoints\SocketEndPoint.cs" />
     <Compile Include="Interfaces\IListener.cs" />
     <Compile Include="Locator.cs" />
+    <Compile Include="Listeners\RabbitQueueListener.cs" />
     <Compile Include="UI\MainWindowViewModel.cs" />
-    <Compile Include="Sockets\StateObject.cs" />
-    <Compile Include="UI\MessagingEndpoint.cs" />
+    <Compile Include="Listeners\StateObject.cs" />
+    <Compile Include="EndPoints\BaseEndPoint.cs" />
     <Page Include="UI\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -89,7 +97,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Sockets\AsyncSocketListener.cs" />
+    <Compile Include="Listeners\AsyncSocketListener.cs" />
     <Compile Include="UI\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -128,6 +136,7 @@
   <ItemGroup>
     <Resource Include="UI\mail.ico" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.