diff --git a/config/vs2015/botlib.vcxproj b/config/vs2015/botlib.vcxproj
index 146c074..36a2f90 100644
--- a/config/vs2015/botlib.vcxproj
+++ b/config/vs2015/botlib.vcxproj
@@ -21,6 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A410161F-AE9F-485D-A01F-5294891430A6}</ProjectGuid>
     <RootNamespace>botlib</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -69,10 +70,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\build\$(PlatformName)\$(Configuration)\binaries\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\build\$(PlatformName)\$(Configuration)\binaries\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\binaries\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\binaries\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -87,12 +88,12 @@
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\build\$(PlatformName)\$(Configuration)\binaries\</OutDir>
-    <IntDir>..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>..\..\binaries\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\build\$(PlatformName)\$(Configuration)\binaries\</OutDir>
-    <IntDir>..\..\build\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>..\..\binaries\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>..\..\intermediate\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -197,7 +198,7 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\botlib\be_aas_bspq3.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_bspq3.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -209,7 +210,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_cluster.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_cluster.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -221,7 +222,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_debug.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_debug.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -233,7 +234,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_entity.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_entity.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -245,7 +246,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_file.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_file.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -257,7 +258,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_main.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_main.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -269,7 +270,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_move.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_move.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -281,7 +282,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_optimize.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_optimize.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -293,7 +294,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_reach.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_reach.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -305,7 +306,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_route.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_route.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -317,7 +318,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_routealt.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_routealt.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -329,7 +330,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_sample.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_sample.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -341,7 +342,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_char.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_char.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -353,7 +354,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_chat.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_chat.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -365,7 +366,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_gen.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_gen.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -377,7 +378,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_goal.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_goal.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -389,7 +390,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_move.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_move.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -401,7 +402,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_weap.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_weap.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -413,7 +414,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_weight.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_weight.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -425,7 +426,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ea.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ea.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -437,7 +438,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_interface.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_interface.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -449,7 +450,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_crc.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_crc.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -461,7 +462,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_libvar.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_libvar.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -473,7 +474,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_log.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_log.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -485,7 +486,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_memory.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_memory.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -497,7 +498,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_precomp.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_precomp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -509,7 +510,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_script.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_script.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -521,7 +522,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_struct.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_struct.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -535,39 +536,39 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\botlib\aasfile.h" />
-    <ClInclude Include="..\..\botlib\be_aas_bsp.h" />
-    <ClInclude Include="..\..\botlib\be_aas_cluster.h" />
-    <ClInclude Include="..\..\botlib\be_aas_debug.h" />
-    <ClInclude Include="..\..\botlib\be_aas_def.h" />
-    <ClInclude Include="..\..\botlib\be_aas_entity.h" />
-    <ClInclude Include="..\..\botlib\be_aas_file.h" />
-    <ClInclude Include="..\..\botlib\be_aas_funcs.h" />
-    <ClInclude Include="..\..\botlib\be_aas_main.h" />
-    <ClInclude Include="..\..\botlib\be_aas_move.h" />
-    <ClInclude Include="..\..\botlib\be_aas_optimize.h" />
-    <ClInclude Include="..\..\botlib\be_aas_reach.h" />
-    <ClInclude Include="..\..\botlib\be_aas_route.h" />
-    <ClInclude Include="..\..\botlib\be_aas_routealt.h" />
-    <ClInclude Include="..\..\botlib\be_aas_sample.h" />
-    <ClInclude Include="..\..\botlib\be_ai_weight.h" />
-    <ClInclude Include="..\..\botlib\be_interface.h" />
-    <ClInclude Include="..\..\game\bg_public.h" />
-    <ClInclude Include="..\..\qcommon\cm_public.h" />
-    <ClInclude Include="..\..\game\g_public.h" />
-    <ClInclude Include="..\..\botlib\l_crc.h" />
-    <ClInclude Include="..\..\botlib\l_libvar.h" />
-    <ClInclude Include="..\..\botlib\l_log.h" />
-    <ClInclude Include="..\..\botlib\l_memory.h" />
-    <ClInclude Include="..\..\botlib\l_precomp.h" />
-    <ClInclude Include="..\..\botlib\l_script.h" />
-    <ClInclude Include="..\..\botlib\l_struct.h" />
-    <ClInclude Include="..\..\botlib\l_utils.h" />
-    <ClInclude Include="..\..\game\q_shared.h" />
-    <ClInclude Include="..\..\qcommon\qcommon.h" />
-    <ClInclude Include="..\..\qcommon\qfiles.h" />
-    <ClInclude Include="..\..\server\server.h" />
-    <ClInclude Include="..\..\game\surfaceflags.h" />
+    <ClInclude Include="..\..\source\engine\botlib\aasfile.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_bsp.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_cluster.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_debug.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_def.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_entity.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_file.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_funcs.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_main.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_move.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_optimize.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_reach.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_route.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_routealt.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_sample.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_ai_weight.h" />
+    <ClInclude Include="..\..\source\engine\botlib\be_interface.h" />
+    <ClInclude Include="..\..\source\game\bg_public.h" />
+    <ClInclude Include="..\..\source\qcommon\cm_public.h" />
+    <ClInclude Include="..\..\source\game\g_public.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_crc.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_libvar.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_log.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_memory.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_precomp.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_script.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_struct.h" />
+    <ClInclude Include="..\..\source\engine\botlib\l_utils.h" />
+    <ClInclude Include="..\..\source\game\q_shared.h" />
+    <ClInclude Include="..\..\source\qcommon\qcommon.h" />
+    <ClInclude Include="..\..\source\qcommon\qfiles.h" />
+    <ClInclude Include="..\..\source\server\server.h" />
+    <ClInclude Include="..\..\source\game\surfaceflags.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/config/vs2015/botlib.vcxproj.filters b/config/vs2015/botlib.vcxproj.filters
index f092e9c..4547f6a 100644
--- a/config/vs2015/botlib.vcxproj.filters
+++ b/config/vs2015/botlib.vcxproj.filters
@@ -11,189 +11,189 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\botlib\be_aas_bspq3.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_bspq3.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_cluster.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_cluster.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_debug.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_debug.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_entity.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_entity.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_file.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_file.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_main.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_move.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_move.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_optimize.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_optimize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_reach.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_reach.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_route.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_route.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_routealt.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_routealt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_aas_sample.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_aas_sample.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_char.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_char.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_chat.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_chat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_gen.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_gen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_goal.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_goal.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_move.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_move.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_weap.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_weap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ai_weight.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ai_weight.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_ea.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_ea.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\be_interface.c">
+    <ClCompile Include="..\..\source\engine\botlib\be_interface.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_crc.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_crc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_libvar.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_libvar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_log.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_log.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_memory.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_memory.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_precomp.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_precomp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_script.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_script.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\botlib\l_struct.c">
+    <ClCompile Include="..\..\source\engine\botlib\l_struct.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\botlib\aasfile.h">
+    <ClInclude Include="..\..\source\engine\botlib\aasfile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_bsp.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_bsp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_cluster.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_cluster.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_debug.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_debug.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_def.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_def.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_entity.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_entity.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_file.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_file.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_funcs.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_funcs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_main.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_move.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_move.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_optimize.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_optimize.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_reach.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_reach.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_route.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_route.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_routealt.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_routealt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_aas_sample.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_aas_sample.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_ai_weight.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_ai_weight.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\be_interface.h">
+    <ClInclude Include="..\..\source\engine\botlib\be_interface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game\bg_public.h">
+    <ClInclude Include="..\..\source\game\bg_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\qcommon\cm_public.h">
+    <ClInclude Include="..\..\source\qcommon\cm_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game\g_public.h">
+    <ClInclude Include="..\..\source\game\g_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_crc.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_crc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_libvar.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_libvar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_log.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_memory.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_memory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_precomp.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_precomp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_script.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_script.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_struct.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_struct.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\botlib\l_utils.h">
+    <ClInclude Include="..\..\source\engine\botlib\l_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game\q_shared.h">
+    <ClInclude Include="..\..\source\game\q_shared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\qcommon\qcommon.h">
+    <ClInclude Include="..\..\source\qcommon\qcommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\qcommon\qfiles.h">
+    <ClInclude Include="..\..\source\qcommon\qfiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\server\server.h">
+    <ClInclude Include="..\..\source\server\server.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game\surfaceflags.h">
+    <ClInclude Include="..\..\source\game\surfaceflags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/source/botlib/aasfile.h b/source/engine/botlib/aasfile.h
similarity index 100%
rename from source/botlib/aasfile.h
rename to source/engine/botlib/aasfile.h
diff --git a/source/botlib/be_aas_bsp.h b/source/engine/botlib/be_aas_bsp.h
similarity index 100%
rename from source/botlib/be_aas_bsp.h
rename to source/engine/botlib/be_aas_bsp.h
diff --git a/source/botlib/be_aas_bspq3.c b/source/engine/botlib/be_aas_bspq3.c
similarity index 99%
rename from source/botlib/be_aas_bspq3.c
rename to source/engine/botlib/be_aas_bspq3.c
index a6e76b3..327f5cb 100644
--- a/source/botlib/be_aas_bspq3.c
+++ b/source/engine/botlib/be_aas_bspq3.c
@@ -29,14 +29,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
 
diff --git a/source/botlib/be_aas_cluster.c b/source/engine/botlib/be_aas_cluster.c
similarity index 99%
rename from source/botlib/be_aas_cluster.c
rename to source/engine/botlib/be_aas_cluster.c
index 118dd0a..de1e887 100644
--- a/source/botlib/be_aas_cluster.c
+++ b/source/engine/botlib/be_aas_cluster.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_memory.h"
 #include "l_libvar.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
 
diff --git a/source/botlib/be_aas_cluster.h b/source/engine/botlib/be_aas_cluster.h
similarity index 100%
rename from source/botlib/be_aas_cluster.h
rename to source/engine/botlib/be_aas_cluster.h
diff --git a/source/botlib/be_aas_debug.c b/source/engine/botlib/be_aas_debug.c
similarity index 99%
rename from source/botlib/be_aas_debug.c
rename to source/engine/botlib/be_aas_debug.c
index a665c0c..bcd3f79 100644
--- a/source/botlib/be_aas_debug.c
+++ b/source/engine/botlib/be_aas_debug.c
@@ -29,15 +29,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "l_libvar.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_interface.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_debug.h b/source/engine/botlib/be_aas_debug.h
similarity index 100%
rename from source/botlib/be_aas_debug.h
rename to source/engine/botlib/be_aas_debug.h
diff --git a/source/botlib/be_aas_def.h b/source/engine/botlib/be_aas_def.h
similarity index 100%
rename from source/botlib/be_aas_def.h
rename to source/engine/botlib/be_aas_def.h
diff --git a/source/botlib/be_aas_entity.c b/source/engine/botlib/be_aas_entity.c
similarity index 99%
rename from source/botlib/be_aas_entity.c
rename to source/engine/botlib/be_aas_entity.c
index be09029..ad3577a 100644
--- a/source/botlib/be_aas_entity.c
+++ b/source/engine/botlib/be_aas_entity.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
@@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_utils.h"
 #include "l_log.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_entity.h b/source/engine/botlib/be_aas_entity.h
similarity index 100%
rename from source/botlib/be_aas_entity.h
rename to source/engine/botlib/be_aas_entity.h
diff --git a/source/botlib/be_aas_file.c b/source/engine/botlib/be_aas_file.c
similarity index 99%
rename from source/botlib/be_aas_file.c
rename to source/engine/botlib/be_aas_file.c
index 50d644e..199e4ad 100644
--- a/source/botlib/be_aas_file.c
+++ b/source/engine/botlib/be_aas_file.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
@@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_libvar.h"
 #include "l_utils.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_file.h b/source/engine/botlib/be_aas_file.h
similarity index 100%
rename from source/botlib/be_aas_file.h
rename to source/engine/botlib/be_aas_file.h
diff --git a/source/botlib/be_aas_funcs.h b/source/engine/botlib/be_aas_funcs.h
similarity index 100%
rename from source/botlib/be_aas_funcs.h
rename to source/engine/botlib/be_aas_funcs.h
diff --git a/source/botlib/be_aas_main.c b/source/engine/botlib/be_aas_main.c
similarity index 99%
rename from source/botlib/be_aas_main.c
rename to source/engine/botlib/be_aas_main.c
index d76a761..beff343 100644
--- a/source/botlib/be_aas_main.c
+++ b/source/engine/botlib/be_aas_main.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_libvar.h"
 #include "l_utils.h"
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_struct.h"
 #include "l_log.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_main.h b/source/engine/botlib/be_aas_main.h
similarity index 100%
rename from source/botlib/be_aas_main.h
rename to source/engine/botlib/be_aas_main.h
diff --git a/source/botlib/be_aas_move.c b/source/engine/botlib/be_aas_move.c
similarity index 99%
rename from source/botlib/be_aas_move.c
rename to source/engine/botlib/be_aas_move.c
index f9babde..1f1cb10 100644
--- a/source/botlib/be_aas_move.c
+++ b/source/engine/botlib/be_aas_move.c
@@ -29,15 +29,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "l_libvar.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
 
diff --git a/source/botlib/be_aas_move.h b/source/engine/botlib/be_aas_move.h
similarity index 100%
rename from source/botlib/be_aas_move.h
rename to source/engine/botlib/be_aas_move.h
diff --git a/source/botlib/be_aas_optimize.c b/source/engine/botlib/be_aas_optimize.c
similarity index 99%
rename from source/botlib/be_aas_optimize.c
rename to source/engine/botlib/be_aas_optimize.c
index 605dc4d..833518e 100644
--- a/source/botlib/be_aas_optimize.c
+++ b/source/engine/botlib/be_aas_optimize.c
@@ -30,15 +30,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_libvar.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_optimize.h b/source/engine/botlib/be_aas_optimize.h
similarity index 100%
rename from source/botlib/be_aas_optimize.h
rename to source/engine/botlib/be_aas_optimize.h
diff --git a/source/botlib/be_aas_reach.c b/source/engine/botlib/be_aas_reach.c
similarity index 99%
rename from source/botlib/be_aas_reach.c
rename to source/engine/botlib/be_aas_reach.c
index 223421d..254964c 100644
--- a/source/botlib/be_aas_reach.c
+++ b/source/engine/botlib/be_aas_reach.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_log.h"
 #include "l_memory.h"
 #include "l_script.h"
@@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
 
diff --git a/source/botlib/be_aas_reach.h b/source/engine/botlib/be_aas_reach.h
similarity index 100%
rename from source/botlib/be_aas_reach.h
rename to source/engine/botlib/be_aas_reach.h
diff --git a/source/botlib/be_aas_route.c b/source/engine/botlib/be_aas_route.c
similarity index 99%
rename from source/botlib/be_aas_route.c
rename to source/engine/botlib/be_aas_route.c
index 642be81..5214085 100644
--- a/source/botlib/be_aas_route.c
+++ b/source/engine/botlib/be_aas_route.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_utils.h"
 #include "l_memory.h"
 #include "l_log.h"
@@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_route.h b/source/engine/botlib/be_aas_route.h
similarity index 100%
rename from source/botlib/be_aas_route.h
rename to source/engine/botlib/be_aas_route.h
diff --git a/source/botlib/be_aas_routealt.c b/source/engine/botlib/be_aas_routealt.c
similarity index 98%
rename from source/botlib/be_aas_routealt.c
rename to source/engine/botlib/be_aas_routealt.c
index 956302d..9b700fe 100644
--- a/source/botlib/be_aas_routealt.c
+++ b/source/engine/botlib/be_aas_routealt.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_utils.h"
 #include "l_memory.h"
 #include "l_log.h"
@@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_routealt.h b/source/engine/botlib/be_aas_routealt.h
similarity index 100%
rename from source/botlib/be_aas_routealt.h
rename to source/engine/botlib/be_aas_routealt.h
diff --git a/source/botlib/be_aas_sample.c b/source/engine/botlib/be_aas_sample.c
similarity index 99%
rename from source/botlib/be_aas_sample.c
rename to source/engine/botlib/be_aas_sample.c
index 16caccc..9ff265a 100644
--- a/source/botlib/be_aas_sample.c
+++ b/source/engine/botlib/be_aas_sample.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_libvar.h"
 #endif
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_interface.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
diff --git a/source/botlib/be_aas_sample.h b/source/engine/botlib/be_aas_sample.h
similarity index 100%
rename from source/botlib/be_aas_sample.h
rename to source/engine/botlib/be_aas_sample.h
diff --git a/source/botlib/be_ai_char.c b/source/engine/botlib/be_ai_char.c
similarity index 99%
rename from source/botlib/be_ai_char.c
rename to source/engine/botlib/be_ai_char.c
index a874a3d..42d8b50 100644
--- a/source/botlib/be_ai_char.c
+++ b/source/engine/botlib/be_ai_char.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_log.h"
 #include "l_memory.h"
 #include "l_utils.h"
@@ -38,11 +38,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_struct.h"
 #include "l_libvar.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
-#include "../game/be_ai_char.h"
+#include "../../game/be_ai_char.h"
 
 #define MAX_CHARACTERISTICS		80
 
diff --git a/source/botlib/be_ai_chat.c b/source/engine/botlib/be_ai_chat.c
similarity index 99%
rename from source/botlib/be_ai_chat.c
rename to source/engine/botlib/be_ai_chat.c
index ec735b3..6a08947 100644
--- a/source/botlib/be_ai_chat.c
+++ b/source/engine/botlib/be_ai_chat.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_libvar.h"
 #include "l_script.h"
@@ -38,12 +38,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_utils.h"
 #include "l_log.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
-#include "../game/be_ea.h"
-#include "../game/be_ai_chat.h"
+#include "../../game/be_ea.h"
+#include "../../game/be_ai_chat.h"
 
 
 //escape character
diff --git a/source/botlib/be_ai_gen.c b/source/engine/botlib/be_ai_gen.c
similarity index 96%
rename from source/botlib/be_ai_gen.c
rename to source/engine/botlib/be_ai_gen.c
index b897738..6f0081e 100644
--- a/source/botlib/be_ai_gen.c
+++ b/source/engine/botlib/be_ai_gen.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_log.h"
 #include "l_utils.h"
@@ -37,11 +37,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
-#include "../game/be_ai_gen.h"
+#include "../../game/be_ai_gen.h"
 
 //===========================================================================
 //
diff --git a/source/botlib/be_ai_goal.c b/source/engine/botlib/be_ai_goal.c
similarity index 99%
rename from source/botlib/be_ai_goal.c
rename to source/engine/botlib/be_ai_goal.c
index 733df43..e22637b 100644
--- a/source/botlib/be_ai_goal.c
+++ b/source/engine/botlib/be_ai_goal.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_utils.h"
 #include "l_libvar.h"
 #include "l_memory.h"
@@ -38,13 +38,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_ai_weight.h"
-#include "../game/be_ai_goal.h"
-#include "../game/be_ai_move.h"
+#include "../../game/be_ai_goal.h"
+#include "../../game/be_ai_move.h"
 
 //#define DEBUG_AI_GOAL
 #ifdef RANDOMIZE
diff --git a/source/botlib/be_ai_move.c b/source/engine/botlib/be_ai_move.c
similarity index 99%
rename from source/botlib/be_ai_move.c
rename to source/engine/botlib/be_ai_move.c
index 965e50c..40972d4 100644
--- a/source/botlib/be_ai_move.c
+++ b/source/engine/botlib/be_ai_move.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_libvar.h"
 #include "l_utils.h"
@@ -37,14 +37,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 
-#include "../game/be_ea.h"
-#include "../game/be_ai_goal.h"
-#include "../game/be_ai_move.h"
+#include "../../game/be_ea.h"
+#include "../../game/be_ai_goal.h"
+#include "../../game/be_ai_move.h"
 
 
 //#define DEBUG_AI_MOVE
diff --git a/source/botlib/be_ai_weap.c b/source/engine/botlib/be_ai_weap.c
similarity index 99%
rename from source/botlib/be_ai_weap.c
rename to source/engine/botlib/be_ai_weap.c
index 2929b6b..c81473d 100644
--- a/source/botlib/be_ai_weap.c
+++ b/source/engine/botlib/be_ai_weap.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_libvar.h"
 #include "l_log.h"
 #include "l_memory.h"
@@ -38,12 +38,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_ai_weight.h"		//fuzzy weights
-#include "../game/be_ai_weap.h"
+#include "../../game/be_ai_weap.h"
 
 //#define DEBUG_AI_WEAP
 
diff --git a/source/botlib/be_ai_weight.c b/source/engine/botlib/be_ai_weight.c
similarity index 99%
rename from source/botlib/be_ai_weight.c
rename to source/engine/botlib/be_ai_weight.c
index 4b11366..7910501 100644
--- a/source/botlib/be_ai_weight.c
+++ b/source/engine/botlib/be_ai_weight.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_log.h"
 #include "l_utils.h"
@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_struct.h"
 #include "l_libvar.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_interface.h"
 #include "be_ai_weight.h"
diff --git a/source/botlib/be_ai_weight.h b/source/engine/botlib/be_ai_weight.h
similarity index 100%
rename from source/botlib/be_ai_weight.h
rename to source/engine/botlib/be_ai_weight.h
diff --git a/source/botlib/be_ea.c b/source/engine/botlib/be_ea.c
similarity index 99%
rename from source/botlib/be_ea.c
rename to source/engine/botlib/be_ea.c
index 5c0dd6c..c0b7f22 100644
--- a/source/botlib/be_ea.c
+++ b/source/engine/botlib/be_ea.c
@@ -29,12 +29,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_script.h"
 #include "l_precomp.h"
 #include "l_struct.h"
-#include "../game/botlib.h"
+#include "../../game/botlib.h"
 #include "be_interface.h"
 
 #define MAX_USERMOVE				400
diff --git a/source/botlib/be_interface.c b/source/engine/botlib/be_interface.c
similarity index 98%
rename from source/botlib/be_interface.c
rename to source/engine/botlib/be_interface.c
index b4f2d3c..4e85e26 100644
--- a/source/botlib/be_interface.c
+++ b/source/engine/botlib/be_interface.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_log.h"
 #include "l_libvar.h"
@@ -37,20 +37,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "l_precomp.h"
 #include "l_struct.h"
 #include "aasfile.h"
-#include "../game/botlib.h"
-#include "../game/be_aas.h"
+#include "../../game/botlib.h"
+#include "../../game/be_aas.h"
 #include "be_aas_funcs.h"
 #include "be_aas_def.h"
 #include "be_interface.h"
 
-#include "../game/be_ea.h"
+#include "../../game/be_ea.h"
 #include "be_ai_weight.h"
-#include "../game/be_ai_goal.h"
-#include "../game/be_ai_move.h"
-#include "../game/be_ai_weap.h"
-#include "../game/be_ai_chat.h"
-#include "../game/be_ai_char.h"
-#include "../game/be_ai_gen.h"
+#include "../../game/be_ai_goal.h"
+#include "../../game/be_ai_move.h"
+#include "../../game/be_ai_weap.h"
+#include "../../game/be_ai_chat.h"
+#include "../../game/be_ai_char.h"
+#include "../../game/be_ai_gen.h"
 
 //library globals in a structure
 botlib_globals_t botlibglobals;
diff --git a/source/botlib/be_interface.h b/source/engine/botlib/be_interface.h
similarity index 100%
rename from source/botlib/be_interface.h
rename to source/engine/botlib/be_interface.h
diff --git a/source/botlib/l_crc.c b/source/engine/botlib/l_crc.c
similarity index 98%
rename from source/botlib/l_crc.c
rename to source/engine/botlib/l_crc.c
index 8b1067b..ce89a9b 100644
--- a/source/botlib/l_crc.c
+++ b/source/engine/botlib/l_crc.c
@@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdio.h>
 #include <string.h>
 
-#include "../game/q_shared.h"
-#include "../game/botlib.h"
+#include "../../game/q_shared.h"
+#include "../../game/botlib.h"
 #include "be_interface.h"			//for botimport.Print
 
 
diff --git a/source/botlib/l_crc.h b/source/engine/botlib/l_crc.h
similarity index 100%
rename from source/botlib/l_crc.h
rename to source/engine/botlib/l_crc.h
diff --git a/source/botlib/l_libvar.c b/source/engine/botlib/l_libvar.c
similarity index 99%
rename from source/botlib/l_libvar.c
rename to source/engine/botlib/l_libvar.c
index 0207660..b8b579a 100644
--- a/source/botlib/l_libvar.c
+++ b/source/engine/botlib/l_libvar.c
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
+#include "../../game/q_shared.h"
 #include "l_memory.h"
 #include "l_libvar.h"
 
diff --git a/source/botlib/l_libvar.h b/source/engine/botlib/l_libvar.h
similarity index 100%
rename from source/botlib/l_libvar.h
rename to source/engine/botlib/l_libvar.h
diff --git a/source/botlib/l_log.c b/source/engine/botlib/l_log.c
similarity index 98%
rename from source/botlib/l_log.c
rename to source/engine/botlib/l_log.c
index 7b1a346..8a5edca 100644
--- a/source/botlib/l_log.c
+++ b/source/engine/botlib/l_log.c
@@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdio.h>
 #include <string.h>
 
-#include "../game/q_shared.h"
-#include "../game/botlib.h"
+#include "../../game/q_shared.h"
+#include "../../game/botlib.h"
 #include "be_interface.h"			//for botimport.Print
 #include "l_libvar.h"
 
diff --git a/source/botlib/l_log.h b/source/engine/botlib/l_log.h
similarity index 100%
rename from source/botlib/l_log.h
rename to source/engine/botlib/l_log.h
diff --git a/source/botlib/l_memory.c b/source/engine/botlib/l_memory.c
similarity index 99%
rename from source/botlib/l_memory.c
rename to source/engine/botlib/l_memory.c
index 7bc12f6..d70fb7b 100644
--- a/source/botlib/l_memory.c
+++ b/source/engine/botlib/l_memory.c
@@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include "../game/q_shared.h"
-#include "../game/botlib.h"
+#include "../../game/q_shared.h"
+#include "../../game/botlib.h"
 #include "l_log.h"
 #include "be_interface.h"
 
diff --git a/source/botlib/l_memory.h b/source/engine/botlib/l_memory.h
similarity index 100%
rename from source/botlib/l_memory.h
rename to source/engine/botlib/l_memory.h
diff --git a/source/botlib/l_precomp.c b/source/engine/botlib/l_precomp.c
similarity index 99%
rename from source/botlib/l_precomp.c
rename to source/engine/botlib/l_precomp.c
index a07506b..ed47e8a 100644
--- a/source/botlib/l_precomp.c
+++ b/source/engine/botlib/l_precomp.c
@@ -53,8 +53,8 @@ typedef enum {qfalse, qtrue}	qboolean;
 #endif //SCREWUP
 
 #ifdef BOTLIB
-#include "../game/q_shared.h"
-#include "../game/botlib.h"
+#include "../../game/q_shared.h"
+#include "../../game/botlib.h"
 #include "be_interface.h"
 #include "l_memory.h"
 #include "l_script.h"
diff --git a/source/botlib/l_precomp.h b/source/engine/botlib/l_precomp.h
similarity index 100%
rename from source/botlib/l_precomp.h
rename to source/engine/botlib/l_precomp.h
diff --git a/source/botlib/l_script.c b/source/engine/botlib/l_script.c
similarity index 99%
rename from source/botlib/l_script.c
rename to source/engine/botlib/l_script.c
index 7419864..2b6818c 100644
--- a/source/botlib/l_script.c
+++ b/source/engine/botlib/l_script.c
@@ -49,8 +49,8 @@ typedef enum {qfalse, qtrue}	qboolean;
 
 #ifdef BOTLIB
 //include files for usage in the bot library
-#include "../game/q_shared.h"
-#include "../game/botlib.h"
+#include "../../game/q_shared.h"
+#include "../../game/botlib.h"
 #include "be_interface.h"
 #include "l_script.h"
 #include "l_memory.h"
diff --git a/source/botlib/l_script.h b/source/engine/botlib/l_script.h
similarity index 100%
rename from source/botlib/l_script.h
rename to source/engine/botlib/l_script.h
diff --git a/source/botlib/l_struct.c b/source/engine/botlib/l_struct.c
similarity index 99%
rename from source/botlib/l_struct.c
rename to source/engine/botlib/l_struct.c
index 7f733c5..62db763 100644
--- a/source/botlib/l_struct.c
+++ b/source/engine/botlib/l_struct.c
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *****************************************************************************/
 
 #ifdef BOTLIB
-#include "../game/q_shared.h"
-#include "../game/botlib.h"				//for the include of be_interface.h
+#include "../../game/q_shared.h"
+#include "../../game/botlib.h"				//for the include of be_interface.h
 #include "l_script.h"
 #include "l_precomp.h"
 #include "l_struct.h"
diff --git a/source/botlib/l_struct.h b/source/engine/botlib/l_struct.h
similarity index 100%
rename from source/botlib/l_struct.h
rename to source/engine/botlib/l_struct.h
diff --git a/source/botlib/l_utils.h b/source/engine/botlib/l_utils.h
similarity index 100%
rename from source/botlib/l_utils.h
rename to source/engine/botlib/l_utils.h