diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index 0c928dc4..e5fdcd51 100644
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -22,7 +22,7 @@ SOURCES =  \
 	SparkleHelpers.cs \
 	SparkleListenerBase.cs \
 	SparkleListenerIrc.cs \
-        SparkleListenerTcp.cs \
+	SparkleListenerTcp.cs \
 	SparkleOptions.cs \
 	SparklePaths.cs \
 	SparkleRepoBase.cs \
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
index 68b49e8e..848b4282 100644
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -88,13 +88,21 @@
     <Compile Include="SparkleMacWatcher.cs" />
     <Compile Include="SparkleEventLog.cs" />
     <Compile Include="SparkleBadger.cs" />
-    <Compile Include="SparkleEventLogController.cs" />
     <Compile Include="SparkleBubbles.cs" />
-    <Compile Include="SparkleBubblesController.cs" />
     <Compile Include="SparkleSetup.cs" />
-    <Compile Include="SparkleSetupController.cs" />
     <Compile Include="SparkleSetupWindow.cs" />
-    <Compile Include="SparkleStatusIconController.cs" />
+    <Compile Include="..\SparkleBubblesController.cs">
+      <Link>SparkleBubblesController.cs</Link>
+    </Compile>
+    <Compile Include="..\SparkleEventLogController.cs">
+      <Link>SparkleEventLogController.cs</Link>
+    </Compile>
+    <Compile Include="..\SparkleSetupController.cs">
+      <Link>SparkleSetupController.cs</Link>
+    </Compile>
+    <Compile Include="..\SparkleStatusIconController.cs">
+      <Link>SparkleStatusIconController.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Include="MainMenu.xib" />
diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
index c757da22..6dcb8645 100644
--- a/SparkleShare/Makefile.am
+++ b/SparkleShare/Makefile.am
@@ -14,15 +14,19 @@ endif
 SOURCES =  \
 	SparkleAbout.cs \
 	SparkleBubble.cs \
+	SparkleBubblesController.cs \
 	SparkleController.cs \
 	SparkleEntry.cs \
+	SparkleEventLog.cs \
+	SparkleEventLogController.cs \
 	SparkleInfobar.cs \
 	SparkleIntro.cs \
 	SparkleLinController.cs \
-	SparkleEventLog.cs \
+	SparkleSetupController.cs \
 	SparkleShare.cs \
 	SparkleSpinner.cs \
 	SparkleStatusIcon.cs \
+	SparkleStatusIconController.cs \
 	SparkleUI.cs \
 	SparkleUIHelpers.cs \
 	SparkleWindow.cs
diff --git a/SparkleShare/Mac/SparkleBubblesController.cs b/SparkleShare/SparkleBubblesController.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleBubblesController.cs
rename to SparkleShare/SparkleBubblesController.cs
diff --git a/SparkleShare/Mac/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleEventLogController.cs
rename to SparkleShare/SparkleEventLogController.cs
diff --git a/SparkleShare/Mac/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleSetupController.cs
rename to SparkleShare/SparkleSetupController.cs
diff --git a/SparkleShare/SparkleShare.csproj b/SparkleShare/SparkleShare.csproj
index 839d9223..bfb9ee63 100644
--- a/SparkleShare/SparkleShare.csproj
+++ b/SparkleShare/SparkleShare.csproj
@@ -52,6 +52,10 @@
     <Compile Include="SparkleController.cs" />
     <Compile Include="SparkleAbout.cs" />
     <Compile Include="SparkleLinController.cs" />
+    <Compile Include="SparkleBubblesController.cs" />
+    <Compile Include="SparkleEventLogController.cs" />
+    <Compile Include="SparkleSetupController.cs" />
+    <Compile Include="SparkleStatusIconController.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SparkleLib\SparkleLib.csproj">
diff --git a/SparkleShare/Mac/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleStatusIconController.cs
rename to SparkleShare/SparkleStatusIconController.cs