diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs b/OpenSim/Tools/LaunchSLClient/Form1.Designer.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs
rename to OpenSim/Tools/LaunchSLClient/Form1.Designer.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/Form1.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs
rename to OpenSim/Tools/LaunchSLClient/Form1.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx b/OpenSim/Tools/LaunchSLClient/Form1.resx
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx
rename to OpenSim/Tools/LaunchSLClient/Form1.resx
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs b/OpenSim/Tools/LaunchSLClient/LauncherException.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs
rename to OpenSim/Tools/LaunchSLClient/LauncherException.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs b/OpenSim/Tools/LaunchSLClient/Program.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs
rename to OpenSim/Tools/LaunchSLClient/Program.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs b/OpenSim/Tools/LaunchSLClient/Properties/AssemblyInfo.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs
rename to OpenSim/Tools/LaunchSLClient/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs b/OpenSim/Tools/LaunchSLClient/Properties/Resources.Designer.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs
rename to OpenSim/Tools/LaunchSLClient/Properties/Resources.Designer.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx b/OpenSim/Tools/LaunchSLClient/Properties/Resources.resx
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx
rename to OpenSim/Tools/LaunchSLClient/Properties/Resources.resx
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs b/OpenSim/Tools/LaunchSLClient/Properties/Settings.Designer.cs
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs
rename to OpenSim/Tools/LaunchSLClient/Properties/Settings.Designer.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings b/OpenSim/Tools/LaunchSLClient/Properties/Settings.settings
similarity index 100%
rename from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings
rename to OpenSim/Tools/LaunchSLClient/Properties/Settings.settings
diff --git a/OpenSim/Tools/LaunchSLClient/prebuild.xml b/OpenSim/Tools/LaunchSLClient/prebuild.xml
deleted file mode 100644
index 8e58ba6e0b..0000000000
--- a/OpenSim/Tools/LaunchSLClient/prebuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
-  <Solution name="LaunchSLClient" activeConfig="Debug" path="./" version="0.5.0-svn">
-    <Configuration name="Debug">
-      <Options>
-        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
-        <OptimizeCode>false</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>../../../bin</OutputPath>
-        <DebugInformation>true</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-    <Configuration name="Release">
-      <Options>
-        <CompilerDefines>TRACE</CompilerDefines>
-        <OptimizeCode>true</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>../../../bin</OutputPath>
-        <DebugInformation>false</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-
-    <Project name="LaunchSLClient" path="LaunchSLClient" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.IO" localCopy="false"/>
-      <Reference name="System.Collections" localCopy="false"/>
-      <Reference name="System.Collections.Generic" localCopy="false"/>
-      <Reference name="System.ComponentModel" localCopy="false"/>
-      <Reference name="System.Data" localCopy="false"/>
-      <Reference name="System.Diagnostics" localCopy="false"/>
-      <Reference name="System.Drawing" localCopy="false"/>
-      <Reference name="System.Text" localCopy="false"/>
-      <Reference name="System.Text.RegularExpressions" localCopy="false"/>
-      <Reference name="System.Windows.Forms" localCopy="false"/>
-      <Reference name="Microsoft.Win32" localCopy="false"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-  </Solution>
-</Prebuild>
diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.bat b/OpenSim/Tools/LaunchSLClient/runprebuild.bat
deleted file mode 100755
index 0427d2ebbd..0000000000
--- a/OpenSim/Tools/LaunchSLClient/runprebuild.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-..\..\..\bin\Prebuild.exe /target nant
-..\..\..\bin\Prebuild.exe /target vs2005
diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.sh b/OpenSim/Tools/LaunchSLClient/runprebuild.sh
deleted file mode 100755
index 7215bc5b53..0000000000
--- a/OpenSim/Tools/LaunchSLClient/runprebuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-mono ../../../bin/Prebuild.exe /target nant
-mono ../../../bin/Prebuild.exe /target vs2005
diff --git a/prebuild.xml b/prebuild.xml
index 135a8d773b..e7c51f9900 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1505,6 +1505,37 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
+
+    <Project name="LaunchSLClient" path="OpenSim/Tools/LaunchSLClient" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.IO" localCopy="false"/>
+      <Reference name="System.Collections" localCopy="false"/>
+      <Reference name="System.Collections.Generic" localCopy="false"/>
+      <Reference name="System.ComponentModel" localCopy="false"/>
+      <Reference name="System.Data" localCopy="false"/>
+      <Reference name="System.Diagnostics" localCopy="false"/>
+      <Reference name="System.Drawing" localCopy="false"/>
+      <Reference name="System.Text" localCopy="false"/>
+      <Reference name="System.Text.RegularExpressions" localCopy="false"/>
+      <Reference name="System.Windows.Forms" localCopy="false"/>
+      <Reference name="Microsoft.Win32" localCopy="false"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
   </Solution>
 
   <!-- Prebuild tool -->