diff --git a/source/Playgrounds/Ben/CompilerTester/CompilerTester.csproj b/source/Playgrounds/Ben/CompilerTester/CompilerTester.csproj
index 06825d9ca..4c818d4dd 100644
--- a/source/Playgrounds/Ben/CompilerTester/CompilerTester.csproj
+++ b/source/Playgrounds/Ben/CompilerTester/CompilerTester.csproj
@@ -65,7 +65,7 @@
       <Project>{1F0EDE86-F6D4-4355-9A97-10E90457770C}</Project>
       <Name>Cosmos.Compiler.Builder</Name>
     </ProjectReference>
-    <ProjectReference Include="..\IL2CPU.PostAssembler\IL2CPU.PostAssembler.csproj">
+    <ProjectReference Include="..\..\..\IL2CPU.PostAssembler\IL2CPU.PostAssembler.csproj">
       <Project>{304961B0-EC78-4809-9121-24F4655E2638}</Project>
       <Name>IL2CPU.PostAssembler</Name>
     </ProjectReference>
diff --git a/source/Playgrounds/Ben/CompilerTester/Program.cs b/source/Playgrounds/Ben/CompilerTester/Program.cs
index 63956af71..40d2a1cea 100644
--- a/source/Playgrounds/Ben/CompilerTester/Program.cs
+++ b/source/Playgrounds/Ben/CompilerTester/Program.cs
@@ -25,16 +25,16 @@ namespace CompilerTester
         {
             try
             {
-                var xBasePath = Path.GetDirectoryName(typeof(Program).Assembly.Location);
-                var xCompileHelper = new CompilerHelper();
+                var xBasePath = BuildOptions.Load().BuildPath;
+                var xCompileHelper = new CompilerHelper(); //Todo push ICompilerOptions into CompilerHelper
 
                 xCompileHelper.GetCacheStateFile += new Func<Assembly, string>(delegate(Assembly aAssembly)
                 {
-                    return Path.Combine(xBasePath, "out\\" + aAssembly.GetName().Name + ".cachestate");
+                    return Path.Combine(xBasePath, aAssembly.GetName().Name + ".cachestate");
                 });
                 xCompileHelper.GetChecksumFile += new Func<Assembly, string>(delegate(Assembly aAssembly)
                 {
-                    return Path.Combine(xBasePath, "out\\" + aAssembly.GetName().Name + ".checksum");
+                    return Path.Combine(xBasePath, aAssembly.GetName().Name + ".checksum");
                 });
                 xCompileHelper.GetOpCodeMap += new Func<Indy.IL2CPU.IL.OpCodeMap>(delegate { return new X86OpCodeMap(); });
                 xCompileHelper.SkipList.Add(typeof(Builder).Assembly);
@@ -45,15 +45,18 @@ namespace CompilerTester
                     });
                 xCompileHelper.SaveAssembler += new Action<Assembly, Indy.IL2CPU.Assembler.Assembler>(delegate(Assembly aAssembly, Indy.IL2CPU.Assembler.Assembler aAssembler)
                 {
-                    using (var xOut = new StreamWriter(Path.Combine(xBasePath, "out\\" + aAssembly.GetName().Name + ".out"), false))
+                    using (var xOut = new StreamWriter(Path.Combine(xBasePath, aAssembly.GetName().Name + ".out"), false))
                     {
                         aAssembler.FlushText(xOut);
                     }
                 });
                 xCompileHelper.DebugLog += delegate(LogSeverityEnum aSeverity, string aMessage) { Console.WriteLine("{0}: {1}", aSeverity, aMessage); };
-                xCompileHelper.Plugs.Add(Path.Combine(Path.Combine(xBasePath, "Plugs"), "Cosmos.Kernel.Plugs.dll"));
-                xCompileHelper.Plugs.Add(Path.Combine(Path.Combine(xBasePath, "Plugs"), "Cosmos.Hardware.Plugs.dll"));
-                xCompileHelper.Plugs.Add(Path.Combine(Path.Combine(xBasePath, "Plugs"), "Cosmos.Sys.Plugs.dll"));
+
+
+                string PlugPath = Path.Combine(Path.Combine(xBasePath, "Tools"), "Plugs"); 
+                xCompileHelper.Plugs.Add(Path.Combine(PlugPath, "Cosmos.Kernel.Plugs.dll"));
+                xCompileHelper.Plugs.Add(Path.Combine(PlugPath, "Cosmos.Hardware.Plugs.dll"));
+                xCompileHelper.Plugs.Add(Path.Combine(PlugPath, "Cosmos.Sys.Plugs.dll"));
                 xCompileHelper.CompileExe(typeof(MatthijsTest.Program).Assembly);
             }
             catch (Exception E)