diff --git a/source/cgame/cgame.bat b/source/cgame/cgame.bat
index c69ac02..99f12c3 100644
--- a/source/cgame/cgame.bat
+++ b/source/cgame/cgame.bat
@@ -2,65 +2,63 @@ rem make sure we have a safe environement
 set LIBRARY=
 set INCLUDE=
 
-mkdir vm
-cd vm
-set cc=lcc -DQ3_VM -DCGAME -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ui %1
+mkdir ..\..\intermediate\vm\cgame
+cd ..\..\intermediate\vm\cgame
 
-rem update PATH variable to point to the quake3 sdk tools
-set PATH=.\..\..\win32\mod-sdk-setup\bin;%PATH%
+set PATH=..\..\..\tools\bin;%PATH%
 
-%cc% ../../game/bg_misc.c
+set src=..\..\..\source
+set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I%src%\cgame -I%src%\game -I%src%\ui %1
+
+%cc% %src%/game/bg_misc.c
 @if errorlevel 1 goto quit
-%cc% ../../game/bg_pmove.c
+%cc% %src%/game/bg_pmove.c
 @if errorlevel 1 goto quit
-%cc% ../../game/bg_slidemove.c
+%cc% %src%/game/bg_slidemove.c
 @if errorlevel 1 goto quit
-%cc% ../../game/bg_lib.c
+%cc% %src%/game/bg_lib.c
 @if errorlevel 1 goto quit
-%cc% ../../game/q_math.c
+%cc% %src%/game/q_math.c
 @if errorlevel 1 goto quit
-%cc% ../../game/q_shared.c
+%cc% %src%/game/q_shared.c
 @if errorlevel 1 goto quit
-%cc% ../cg_consolecmds.c
+%cc% %src%/cgame/cg_consolecmds.c
 @if errorlevel 1 goto quit
-%cc% ../cg_draw.c
+%cc% %src%/cgame/cg_draw.c
 @if errorlevel 1 goto quit
-%cc% ../cg_drawtools.c
+%cc% %src%/cgame/cg_drawtools.c
 @if errorlevel 1 goto quit
-%cc% ../cg_effects.c
+%cc% %src%/cgame/cg_effects.c
 @if errorlevel 1 goto quit
-%cc% ../cg_ents.c
+%cc% %src%/cgame/cg_ents.c
 @if errorlevel 1 goto quit
-%cc% ../cg_event.c
+%cc% %src%/cgame/cg_event.c
 @if errorlevel 1 goto quit
-%cc% ../cg_info.c
+%cc% %src%/cgame/cg_info.c
 @if errorlevel 1 goto quit
-%cc% ../cg_localents.c
+%cc% %src%/cgame/cg_localents.c
 @if errorlevel 1 goto quit
-%cc% ../cg_main.c
+%cc% %src%/cgame/cg_main.c
 @if errorlevel 1 goto quit
-%cc% ../cg_marks.c
+%cc% %src%/cgame/cg_marks.c
 @if errorlevel 1 goto quit
-%cc% ../cg_players.c
+%cc% %src%/cgame/cg_players.c
 @if errorlevel 1 goto quit
-%cc% ../cg_playerstate.c
+%cc% %src%/cgame/cg_playerstate.c
 @if errorlevel 1 goto quit
-%cc% ../cg_predict.c
+%cc% %src%/cgame/cg_predict.c
 @if errorlevel 1 goto quit
-%cc% ../cg_scoreboard.c
+%cc% %src%/cgame/cg_scoreboard.c
 @if errorlevel 1 goto quit
-%cc% ../cg_servercmds.c
+%cc% %src%/cgame/cg_servercmds.c
 @if errorlevel 1 goto quit
-%cc% ../cg_snapshot.c
+%cc% %src%/cgame/cg_snapshot.c
 @if errorlevel 1 goto quit
-%cc% ../cg_view.c
+%cc% %src%/cgame/cg_view.c
 @if errorlevel 1 goto quit
-%cc% ../cg_weapons.c
+%cc% %src%/cgame/cg_weapons.c
 @if errorlevel 1 goto quit
 
-
-
-
-q3asm -f ../cgame
+q3asm -f %src%/cgame/cgame
 :quit
-cd ..
+cd %src%/cgame
diff --git a/source/cgame/cgame.q3asm b/source/cgame/cgame.q3asm
index 8bd1d4a..c44b804 100644
--- a/source/cgame/cgame.q3asm
+++ b/source/cgame/cgame.q3asm
@@ -1,6 +1,6 @@
--o "\quake3\baseq3\vm\cgame"
+-o "..\..\..\binaries\vm\cgame.qvm"
 cg_main
-..\cg_syscalls
+..\..\..\source\cgame\cg_syscalls
 cg_consolecmds
 cg_draw
 cg_drawtools
diff --git a/source/game/game.bat b/source/game/game.bat
index 85764f4..a3ca38e 100644
--- a/source/game/game.bat
+++ b/source/game/game.bat
@@ -2,87 +2,87 @@ rem make sure we have a safe environement
 set LIBRARY=
 set INCLUDE=
 
-mkdir vm
-cd vm
-set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ui %1
+mkdir ..\..\intermediate\vm\game
+cd ..\..\intermediate\vm\game
 
-rem update PATH variable to point to the quake3 sdk tools
-set PATH=.\..\..\win32\mod-sdk-setup\bin;%PATH%
+set PATH=..\..\..\tools\bin;%PATH%
 
-%cc%  ../g_main.c
+set src=..\..\..\source
+set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I%src%\cgame -I%src%\game -I%src%\ui %1
+
+%cc%  %src%/game/g_main.c
 @if errorlevel 1 goto quit
 
-%cc%  ../g_syscalls.c
+%cc%  %src%/game/g_syscalls.c
 @if errorlevel 1 goto quit
 
-%cc%  ../bg_misc.c
+%cc%  %src%/game/bg_misc.c
 @if errorlevel 1 goto quit
-%cc%  ../bg_lib.c
+%cc%  %src%/game/bg_lib.c
 @if errorlevel 1 goto quit
-%cc%  ../bg_pmove.c
+%cc%  %src%/game/bg_pmove.c
 @if errorlevel 1 goto quit
-%cc%  ../bg_slidemove.c
+%cc%  %src%/game/bg_slidemove.c
 @if errorlevel 1 goto quit
-%cc%  ../q_math.c
+%cc%  %src%/game/q_math.c
 @if errorlevel 1 goto quit
-%cc%  ../q_shared.c
+%cc%  %src%/game/q_shared.c
 @if errorlevel 1 goto quit
 
-%cc%  ../ai_dmnet.c
+%cc%  %src%/game/ai_dmnet.c
 @if errorlevel 1 goto quit
-%cc%  ../ai_dmq3.c
+%cc%  %src%/game/ai_dmq3.c
 @if errorlevel 1 goto quit
-%cc%  ../ai_main.c
+%cc%  %src%/game/ai_main.c
 @if errorlevel 1 goto quit
-%cc%  ../ai_chat.c
+%cc%  %src%/game/ai_chat.c
 @if errorlevel 1 goto quit
-%cc%  ../ai_cmd.c
+%cc%  %src%/game/ai_cmd.c
 @if errorlevel 1 goto quit
-%cc%  ../ai_team.c
+%cc%  %src%/game/ai_team.c
 @if errorlevel 1 goto quit
 
-%cc%  ../g_active.c
+%cc%  %src%/game/g_active.c
 @if errorlevel 1 goto quit
-%cc%  ../g_arenas.c
+%cc%  %src%/game/g_arenas.c
 @if errorlevel 1 goto quit
-%cc%  ../g_bot.c
+%cc%  %src%/game/g_bot.c
 @if errorlevel 1 goto quit
-%cc%  ../g_client.c
+%cc%  %src%/game/g_client.c
 @if errorlevel 1 goto quit
-%cc%  ../g_cmds.c
+%cc%  %src%/game/g_cmds.c
 @if errorlevel 1 goto quit
-%cc%  ../g_combat.c
+%cc%  %src%/game/g_combat.c
 @if errorlevel 1 goto quit
-%cc%  ../g_items.c
+%cc%  %src%/game/g_items.c
 @if errorlevel 1 goto quit
-%cc%  ../g_mem.c
+%cc%  %src%/game/g_mem.c
 @if errorlevel 1 goto quit
-%cc%  ../g_misc.c
+%cc%  %src%/game/g_misc.c
 @if errorlevel 1 goto quit
-%cc%  ../g_missile.c
+%cc%  %src%/game/g_missile.c
 @if errorlevel 1 goto quit
-%cc%  ../g_mover.c
+%cc%  %src%/game/g_mover.c
 @if errorlevel 1 goto quit
-%cc%  ../g_session.c
+%cc%  %src%/game/g_session.c
 @if errorlevel 1 goto quit
-%cc%  ../g_spawn.c
+%cc%  %src%/game/g_spawn.c
 @if errorlevel 1 goto quit
-%cc%  ../g_svcmds.c
+%cc%  %src%/game/g_svcmds.c
 @if errorlevel 1 goto quit
-%cc%  ../g_target.c
+%cc%  %src%/game/g_target.c
 @if errorlevel 1 goto quit
-%cc%  ../g_team.c
+%cc%  %src%/game/g_team.c
 @if errorlevel 1 goto quit
-%cc%  ../g_trigger.c
+%cc%  %src%/game/g_trigger.c
 @if errorlevel 1 goto quit
-%cc%  ../g_utils.c
+%cc%  %src%/game/g_utils.c
 @if errorlevel 1 goto quit
-%cc%  ../g_weapon.c
+%cc%  %src%/game/g_weapon.c
 @if errorlevel 1 goto quit
-%cc%  ../ai_vcmd.c
+%cc%  %src%/game/ai_vcmd.c
 @if errorlevel 1 goto quit
 
-
-q3asm -f ../game
+q3asm -f %src%/game/game
 :quit
-cd ..
+cd %src%/game
diff --git a/source/game/game.q3asm b/source/game/game.q3asm
index 04fce75..f8360b0 100644
--- a/source/game/game.q3asm
+++ b/source/game/game.q3asm
@@ -1,6 +1,6 @@
--o "\quake3\baseq3\vm\qagame"
+-o "..\..\..\binaries\vm\qagame.qvm"
 g_main
-..\g_syscalls
+..\..\..\source\game\g_syscalls
 bg_misc
 bg_lib
 bg_pmove
diff --git a/source/q3_ui/q3_ui.bat b/source/q3_ui/q3_ui.bat
index fcf8227..46b91e8 100644
--- a/source/q3_ui/q3_ui.bat
+++ b/source/q3_ui/q3_ui.bat
@@ -2,102 +2,97 @@ rem make sure we have a safe environement
 set LIBRARY=
 set INCLUDE=
 
-mkdir vm
-cd vm
+mkdir ..\..\intermediate\vm\ui
+cd ..\..\intermediate\vm\ui
 
-set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui %1
+set PATH=..\..\..\tools\bin;%PATH%
 
-rem update PATH variable to point to the quake3 sdk tools
-set PATH=.\..\..\win32\mod-sdk-setup\bin;%PATH%
+set src=..\..\..\source
+set cc=lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I%src%\cgame -I%src%\game -I%src%\ui %1
 
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_main.c
+%cc% %src%/q3_ui/ui_main.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_cdkey.c
+%cc% %src%/q3_ui/ui_cdkey.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_ingame.c
+%cc% %src%/q3_ui/ui_ingame.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_serverinfo.c
+%cc% %src%/q3_ui/ui_serverinfo.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_confirm.c
+%cc% %src%/q3_ui/ui_confirm.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_setup.c
+%cc% %src%/q3_ui/ui_setup.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../../game/bg_misc.c
+%cc% %src%/game/bg_misc.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../../game/bg_lib.c
+%cc% %src%/game/bg_lib.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../../game/q_math.c
+%cc% %src%/game/q_math.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../../game/q_shared.c
+%cc% %src%/game/q_shared.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_gameinfo.c
+%cc% %src%/q3_ui/ui_gameinfo.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_atoms.c
+%cc% %src%/q3_ui/ui_atoms.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_connect.c
+%cc% %src%/q3_ui/ui_connect.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_controls2.c
+%cc% %src%/q3_ui/ui_controls2.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_demo2.c
+%cc% %src%/q3_ui/ui_demo2.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_mfield.c
+%cc% %src%/q3_ui/ui_mfield.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_credits.c
+%cc% %src%/q3_ui/ui_credits.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_menu.c
+%cc% %src%/q3_ui/ui_menu.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_options.c
+%cc% %src%/q3_ui/ui_options.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_display.c
+%cc% %src%/q3_ui/ui_display.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_sound.c
+%cc% %src%/q3_ui/ui_sound.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_network.c
+%cc% %src%/q3_ui/ui_network.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_playermodel.c
+%cc% %src%/q3_ui/ui_playermodel.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_players.c
+%cc% %src%/q3_ui/ui_players.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_playersettings.c
+%cc% %src%/q3_ui/ui_playersettings.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_preferences.c
+%cc% %src%/q3_ui/ui_preferences.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_qmenu.c
+%cc% %src%/q3_ui/ui_qmenu.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_servers2.c
+%cc% %src%/q3_ui/ui_servers2.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_sparena.c
+%cc% %src%/q3_ui/ui_sparena.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_specifyserver.c
+%cc% %src%/q3_ui/ui_specifyserver.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_splevel.c
+%cc% %src%/q3_ui/ui_splevel.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_sppostgame.c
+%cc% %src%/q3_ui/ui_sppostgame.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_startserver.c
+%cc% %src%/q3_ui/ui_startserver.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_team.c
+%cc% %src%/q3_ui/ui_team.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_video.c
+%cc% %src%/q3_ui/ui_video.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_cinematics.c
+%cc% %src%/q3_ui/ui_cinematics.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_spskill.c
+%cc% %src%/q3_ui/ui_spskill.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_addbots.c
+%cc% %src%/q3_ui/ui_addbots.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_removebots.c
+%cc% %src%/q3_ui/ui_removebots.c
 @if errorlevel 1 goto quit
-rem lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_loadconfig.c
-rem @if errorlevel 1 goto quit
-rem lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_saveconfig.c
-rem @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_teamorders.c
+%cc% %src%/q3_ui/ui_teamorders.c
 @if errorlevel 1 goto quit
-lcc -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\q3_ui ../ui_mods.c
+%cc% %src%/q3_ui/ui_mods.c
 @if errorlevel 1 goto quit
 
-
-q3asm -f ../q3_ui
+q3asm -f %src%/q3_ui/q3_ui
 :quit
-cd ..
+cd %src%/q3_ui
diff --git a/source/q3_ui/q3_ui.q3asm b/source/q3_ui/q3_ui.q3asm
index f678695..86f8151 100644
--- a/source/q3_ui/q3_ui.q3asm
+++ b/source/q3_ui/q3_ui.q3asm
@@ -1,6 +1,6 @@
--o "\quake3\baseq3\vm\ui"
+-o "..\..\..\binaries\vm\ui.qvm"
 ui_main
-..\ui_syscalls
+..\..\..\source\q3_ui\ui_syscalls
 ui_gameinfo
 ui_atoms
 ui_cinematics