diff --git a/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
similarity index 100%
rename from pCampBot/BotManager.cs
rename to OpenSim/Tools/pCampBot/BotManager.cs
diff --git a/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
similarity index 100%
rename from pCampBot/PhysicsBot.cs
rename to OpenSim/Tools/pCampBot/PhysicsBot.cs
diff --git a/pCampBot/PhysicsCamperBotREADME.txt b/OpenSim/Tools/pCampBot/PhysicsCamperBotREADME.txt
similarity index 100%
rename from pCampBot/PhysicsCamperBotREADME.txt
rename to OpenSim/Tools/pCampBot/PhysicsCamperBotREADME.txt
diff --git a/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
similarity index 100%
rename from pCampBot/pCampBot.cs
rename to OpenSim/Tools/pCampBot/pCampBot.cs
diff --git a/pCampBot/prebuild.xml b/OpenSim/Tools/pCampBot/prebuild.xml
similarity index 89%
rename from pCampBot/prebuild.xml
rename to OpenSim/Tools/pCampBot/prebuild.xml
index 1f49082319..bfaf4086ae 100644
--- a/pCampBot/prebuild.xml
+++ b/OpenSim/Tools/pCampBot/prebuild.xml
@@ -10,7 +10,7 @@
         <WarningLevel>4</WarningLevel>
         <WarningsAsErrors>false</WarningsAsErrors>
         <SuppressWarnings></SuppressWarnings>
-        <OutputPath>../bin</OutputPath>
+        <OutputPath>../../../bin</OutputPath>
         <DebugInformation>true</DebugInformation>
         <IncrementalBuild>true</IncrementalBuild>
         <NoStdLib>false</NoStdLib>
@@ -25,7 +25,7 @@
         <WarningLevel>4</WarningLevel>
         <WarningsAsErrors>false</WarningsAsErrors>
         <SuppressWarnings></SuppressWarnings>
-        <OutputPath>../bin</OutputPath>
+        <OutputPath>../../../bin</OutputPath>
         <DebugInformation>false</DebugInformation>
         <IncrementalBuild>true</IncrementalBuild>
         <NoStdLib>false</NoStdLib>
@@ -37,16 +37,16 @@
     <Project name="pCampBot" path="./" type="Exe">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="OpenSim.Framework.dll"/>
diff --git a/OpenSim/Tools/pCampBot/runprebuild.bat b/OpenSim/Tools/pCampBot/runprebuild.bat
new file mode 100755
index 0000000000..0427d2ebbd
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/runprebuild.bat
@@ -0,0 +1,2 @@
+..\..\..\bin\Prebuild.exe /target nant
+..\..\..\bin\Prebuild.exe /target vs2005
diff --git a/OpenSim/Tools/pCampBot/runprebuild.sh b/OpenSim/Tools/pCampBot/runprebuild.sh
new file mode 100755
index 0000000000..7215bc5b53
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/runprebuild.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mono ../../../bin/Prebuild.exe /target nant
+mono ../../../bin/Prebuild.exe /target vs2005
diff --git a/pCampBot/runprebuild.bat b/pCampBot/runprebuild.bat
deleted file mode 100755
index 05dfe169e3..0000000000
--- a/pCampBot/runprebuild.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-..\bin\Prebuild.exe /target nant
-..\bin\Prebuild.exe /target vs2005
\ No newline at end of file
diff --git a/pCampBot/runprebuild.sh b/pCampBot/runprebuild.sh
deleted file mode 100755
index 23fbfefcce..0000000000
--- a/pCampBot/runprebuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-mono ../bin/Prebuild.exe /target nant
-mono ../bin/Prebuild.exe /target vs2005