diff --git a/bin/CentrED.dat b/Client.bin/CentrED.dat
similarity index 100%
rename from bin/CentrED.dat
rename to Client.bin/CentrED.dat
diff --git a/bin/Profiles/README b/Client.bin/Profiles/README
similarity index 100%
rename from bin/Profiles/README
rename to Client.bin/Profiles/README
diff --git a/bin/nodraw.txt b/Client.bin/nodraw.txt
similarity index 100%
rename from bin/nodraw.txt
rename to Client.bin/nodraw.txt
diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi
index 0e031f5..329546a 100644
--- a/Client/CentrED.lpi
+++ b/Client/CentrED.lpi
@@ -30,7 +30,7 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../bin/CentrED"/>
+            <Filename Value="../Client.bin/CentrED"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
@@ -69,8 +69,7 @@
               <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
               <UseMsgFile Value="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-FE../bin/
--dNoLogging"/>
+            <CustomOptions Value="-dNoLogging"/>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
@@ -82,7 +81,7 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../bin/CentrED.x86"/>
+            <Filename Value="../Client.bin/CentrED.x86"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
@@ -121,8 +120,7 @@
               <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
               <UseMsgFile Value="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-FE../bin/
--dNoLogging"/>
+            <CustomOptions Value="-dNoLogging"/>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
@@ -134,7 +132,7 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../bin/CentrED.x64"/>
+            <Filename Value="../Client.bin/CentrED.x64"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
@@ -173,8 +171,7 @@
               <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
               <UseMsgFile Value="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-FE../bin/
--dNoLogging"/>
+            <CustomOptions Value="-dNoLogging"/>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
@@ -522,7 +519,7 @@
   <CompilerOptions>
     <Version Value="11"/>
     <Target>
-      <Filename Value="../bin/CentrED"/>
+      <Filename Value="../Client.bin/CentrED"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
@@ -552,7 +549,6 @@
         <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
         <UseMsgFile Value="True"/>
       </CompilerMessages>
-      <CustomOptions Value="-FE../bin/"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/Server/cedserver.lpi b/Server/cedserver.lpi
index baf86b2..0c5faff 100644
--- a/Server/cedserver.lpi
+++ b/Server/cedserver.lpi
@@ -23,12 +23,12 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../bin/cedserver"/>
+            <Filename Value="../Server.bin/cedserver"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="..;../Imaging"/>
             <OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
-            <UnitOutputDirectory Value="../obj"/>
+            <UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
             <SrcPath Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
           </SearchPaths>
           <Parsing>
@@ -58,8 +58,7 @@
             <CompilerMessages>
               <UseMsgFile Value="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-FE../bin/
--dNoLogging"/>
+            <CustomOptions Value="-dNoLogging"/>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
@@ -68,12 +67,12 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../bin/cedserver.x86"/>
+            <Filename Value="../Server.bin/cedserver.x86"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="..;../Imaging"/>
             <OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
-            <UnitOutputDirectory Value="../obj"/>
+            <UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
             <SrcPath Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
           </SearchPaths>
           <Parsing>
@@ -103,8 +102,7 @@
             <CompilerMessages>
               <UseMsgFile Value="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-FE../bin/
--dNoLogging"/>
+            <CustomOptions Value="-dNoLogging"/>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
@@ -113,12 +111,12 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../bin/cedserver.x64"/>
+            <Filename Value="../Server.bin/cedserver.x64"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="..;../Imaging"/>
             <OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
-            <UnitOutputDirectory Value="../obj"/>
+            <UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
             <SrcPath Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
           </SearchPaths>
           <Parsing>
@@ -147,8 +145,7 @@
             <CompilerMessages>
               <UseMsgFile Value="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-FE../bin/
--dNoLogging"/>
+            <CustomOptions Value="-dNoLogging"/>
             <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
@@ -269,12 +266,12 @@
   <CompilerOptions>
     <Version Value="11"/>
     <Target>
-      <Filename Value="../bin/cedserver"/>
+      <Filename Value="../Server.bin/cedserver"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="..;../Imaging"/>
       <OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging/ZLib"/>
-      <UnitOutputDirectory Value="../obj"/>
+      <UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
@@ -290,7 +287,6 @@
       <CompilerMessages>
         <UseMsgFile Value="True"/>
       </CompilerMessages>
-      <CustomOptions Value="-FE../bin/"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/bin/.hgdir b/bin/.hgdir
deleted file mode 100644
index e69de29..0000000