diff --git a/src/Mono.VisualC.Code/Makefile.am b/src/Mono.VisualC.Code/Makefile.am
index 1808be5c..11f46573 100644
--- a/src/Mono.VisualC.Code/Makefile.am
+++ b/src/Mono.VisualC.Code/Makefile.am
@@ -73,7 +73,7 @@ EXTRAS = \
 	mono.visualc.code.pc.in 
 
 REFERENCES =  \
-	../Mono.VisualC.Interop/bin/Debug/Mono.VisualC.Interop.dll \
+	../../bin/Debug/Mono.VisualC.Interop.dll \
 	System \
 	System.Core
 
diff --git a/src/Mono.VisualC.Code/Mono.VisualC.Code.csproj b/src/Mono.VisualC.Code/Mono.VisualC.Code.csproj
index 513177f4..ab2ce988 100644
--- a/src/Mono.VisualC.Code/Mono.VisualC.Code.csproj
+++ b/src/Mono.VisualC.Code/Mono.VisualC.Code.csproj
@@ -35,7 +35,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\..\bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -45,7 +45,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\..\bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -54,6 +54,10 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="Mono.VisualC.Interop, Version=1.0.4164.32915, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\Debug\Mono.VisualC.Interop.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -90,12 +94,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Mono.VisualC.Interop\Mono.VisualC.Interop.csproj">
-      <Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
-      <Name>Mono.VisualC.Interop</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
diff --git a/src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj b/src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj
index f9d42fdc..23a9dcb3 100644
--- a/src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj
+++ b/src/Mono.VisualC.Interop/Mono.VisualC.Interop.csproj
@@ -34,7 +34,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\..\bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/src/generator/Makefile.am b/src/generator/Makefile.am
index dafcd847..e1c1a29b 100644
--- a/src/generator/Makefile.am
+++ b/src/generator/Makefile.am
@@ -65,8 +65,7 @@ EXTRAS = \
 	generator.in 
 
 REFERENCES =  \
-	../Mono.VisualC.Code/bin/Debug/Mono.VisualC.Code.dll \
-	../Mono.VisualC.Interop/bin/Debug/Mono.VisualC.Interop.dll \
+	../../bin/Debug/Mono.VisualC.Interop.dll \
 	System \
 	System.Core \
 	System.Xml \
diff --git a/src/generator/generator.csproj b/src/generator/generator.csproj
index 677bc1c7..716bafe1 100644
--- a/src/generator/generator.csproj
+++ b/src/generator/generator.csproj
@@ -68,18 +68,12 @@
     <Reference Include="System.Xml.Linq">
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="Mono.VisualC.Interop, Version=1.0.4164.32966, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\Debug\Mono.VisualC.Interop.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Mono.VisualC.Code\Mono.VisualC.Code.csproj">
-      <Project>{A22BF9D9-BBCB-4462-BE08-0F4D5280B180}</Project>
-      <Name>Mono.VisualC.Code</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Mono.VisualC.Interop\Mono.VisualC.Interop.csproj">
-      <Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
-      <Name>Mono.VisualC.Interop</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
diff --git a/tests/Tests.csproj b/tests/Tests.csproj
index 94946632..8c17fef5 100644
--- a/tests/Tests.csproj
+++ b/tests/Tests.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{3C290CBE-CA39-47F6-B3A0-ACD16C5A38C8}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Tests</RootNamespace>
-    <AssemblyName>Tests</AssemblyName>
+    <AssemblyName>Test</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -35,21 +35,16 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\bin\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="AfterBuild" command="bash -c &quot;if [ `uname` = Darwin ]; then cp CPPTestLib/bin/Debug/libCPPTestLib.dylib ${TargetDir}; fi&quot;" workingdir="${SolutionDir}" />
-      </CustomCommands>
-    </CustomCommands>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -97,4 +92,10 @@
     <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
     <Reference Include="System" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\src\Mono.VisualC.Interop\Mono.VisualC.Interop.csproj">
+      <Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
+      <Name>Mono.VisualC.Interop</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file