diff --git a/intern/bmfont/make/msvc_6_0/BMF_bmfont.dsp b/intern/bmfont/make/msvc_6_0/bmfont.dsp
similarity index 69%
rename from intern/bmfont/make/msvc_6_0/BMF_bmfont.dsp
rename to intern/bmfont/make/msvc_6_0/bmfont.dsp
index dba5b13bb92..4a802f9f5c2 100644
--- a/intern/bmfont/make/msvc_6_0/BMF_bmfont.dsp
+++ b/intern/bmfont/make/msvc_6_0/bmfont.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="BMF_bmfont" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="bmfont" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=BMF_bmfont - Win32 Debug
+CFG=bmfont - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "BMF_bmfont.mak".
+!MESSAGE NMAKE /f "bmfont.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "BMF_bmfont.mak" CFG="BMF_bmfont - Win32 Debug"
+!MESSAGE NMAKE /f "bmfont.mak" CFG="bmfont - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "BMF_bmfont - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "BMF_bmfont - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "bmfont - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "bmfont - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=BMF_bmfont - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "BMF_bmfont - Win32 Release"
+!IF  "$(CFG)" == "bmfont - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -37,9 +37,10 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../../../../obj/windows/intern/BMF_bmfont/"
-# PROP Intermediate_Dir "../../../../../obj/windows/intern/BMF_bmfont/"
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont"
 # PROP Target_Dir ""
+LINK32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,10 +54,10 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying BMFONT files library (release target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files	COPY "..\..\*.h" "..\..\..\..\..\develop\lib\windows\bmfont\include\"	ECHO Copying lib	COPY "..\..\..\..\..\obj\windows\intern\BMF_bmfont\BMF_bmfont.lib" "..\..\..\..\..\develop\lib\windows\bmfont\lib\libbmfont.a"	ECHO Done
+PostBuild_Cmds=ECHO Creating directories	IF NOT EXIST ..\..\..\..\lib\windows\bmfont\include md ..\..\..\..\lib\windows\bmfont\include	IF NOT EXIST ..\..\..\..\lib\windows\bmfont\lib md ..\..\..\..\lib\windows\bmfont\lib	ECHO Copying header files	COPY "..\..\*.h" "..\..\..\..\lib\windows\bmfont\include\"	ECHO Copying lib	COPY "..\..\..\..\obj\windows\intern\bmfont\bmfont.lib" "..\..\..\..\lib\windows\bmfont\lib\libbmfont.a"	ECHO Done
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "BMF_bmfont - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bmfont - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,9 +66,10 @@ PostBuild_Cmds=ECHO Copying header files	COPY "..\..\*.h" "..\..\..\..\..\develo
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../../../../obj/windows/intern/BMF_bmfont/debug"
-# PROP Intermediate_Dir "../../../../../obj/windows/intern/BMF_bmfont/debug"
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\bmfont\debug"
 # PROP Target_Dir ""
+LINK32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../intern" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -81,15 +83,15 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying BMFONT files library (debug target) to lib tree.
-PostBuild_Cmds=ECHO Copying header files	COPY "..\..\*.h" "..\..\..\..\..\develop\lib\windows\bmfont\include"	ECHO Copying lib	COPY "..\..\..\..\..\obj\windows\intern\BMF_bmfont\debug\BMF_bmfont.lib" "..\..\..\..\..\develop\lib\windows\bmfont\lib\debug\libbmfont.a"	ECHO Done
+PostBuild_Cmds=ECHO Creating directories	IF NOT EXIST ..\..\..\..\lib\windows\bmfont\include md ..\..\..\..\lib\windows\bmfont\include	IF NOT EXIST ..\..\..\..\lib\windows\bmfont\lib\debug md ..\..\..\..\lib\windows\bmfont\lib\debug	ECHO Copying header files	COPY "..\..\*.h" "..\..\..\..\lib\windows\bmfont\include"	ECHO Copying lib	COPY "..\..\..\..\obj\windows\intern\bmfont\debug\bmfont.lib" "..\..\..\..\lib\windows\bmfont\lib\debug\libbmfont.a"	ECHO Done
 # End Special Build Tool
 
 !ENDIF 
 
 # Begin Target
 
-# Name "BMF_bmfont - Win32 Release"
-# Name "BMF_bmfont - Win32 Debug"
+# Name "bmfont - Win32 Release"
+# Name "bmfont - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/intern/bmfont/make/msvc_6_0/BMF_bmfont.dsw b/intern/bmfont/make/msvc_6_0/bmfont.dsw
similarity index 88%
rename from intern/bmfont/make/msvc_6_0/BMF_bmfont.dsw
rename to intern/bmfont/make/msvc_6_0/bmfont.dsw
index 729f4ac5cb2..d2e2f94cd0b 100644
--- a/intern/bmfont/make/msvc_6_0/BMF_bmfont.dsw
+++ b/intern/bmfont/make/msvc_6_0/bmfont.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "BMF_bmfont"=.\BMF_bmfont.dsp - Package Owner=<4>
+Project: "bmfont"=.\bmfont.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/intern/make/msvc_6_0/intern.dsw b/intern/make/msvc_6_0/intern.dsw
index 7dca8e93f74..9864325e288 100644
--- a/intern/make/msvc_6_0/intern.dsw
+++ b/intern/make/msvc_6_0/intern.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "BMF_bmfont"=..\..\bmfont\make\msvc_6_0\BMF_bmfont.dsp - Package Owner=<4>
+Project: "MoTo"="..\..\moto\make\msvc_6_0\MoTo.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "MoTo"=..\..\moto\make\msvc_6_0\MoTo.dsp - Package Owner=<4>
+Project: "blenkey"="..\..\keymaker\make\msvc_6_0\blenkey.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -27,7 +27,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "blenkey"=..\..\keymaker\make\msvc_6_0\blenkey.dsp - Package Owner=<4>
+Project: "bmfont"="..\..\bmfont\make\msvc_6_0\bmfont.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -39,19 +39,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "bmfont"=..\..\bmfont\make\msvc_6_0\bmfont.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bsplib"=..\..\bsp\make\msvc6_0\bsplib.dsp - Package Owner=<4>
+Project: "bsplib"="..\..\bsp\make\msvc6_0\bsplib.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -72,7 +60,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "build_install_all"=.\build_install_all.dsp - Package Owner=<4>
+Project: "build_install_all"=".\build_install_all.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -114,13 +102,13 @@ Package=<4>
     Project_Dep_Name blenkey
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name BMF_bmfont
+    Project_Dep_Name python_freeze
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "container"=..\..\container\make\msvc_6_0\container.dsp - Package Owner=<4>
+Project: "container"="..\..\container\make\msvc_6_0\container.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -132,7 +120,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "decimation"=..\..\decimation\make\msvc_6_0\decimation.dsp - Package Owner=<4>
+Project: "decimation"="..\..\decimation\make\msvc_6_0\decimation.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -153,7 +141,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ghost"=..\..\ghost\make\msvc\ghost.dsp - Package Owner=<4>
+Project: "ghost"="..\..\ghost\make\msvc\ghost.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -168,7 +156,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "guardedalloc"=..\..\guardedalloc\make\msvc_6_0\guardedalloc.dsp - Package Owner=<4>
+Project: "guardedalloc"="..\..\guardedalloc\make\msvc_6_0\guardedalloc.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -180,7 +168,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "iksolver"=..\..\iksolver\make\msvc_6_0\iksolver.dsp - Package Owner=<4>
+Project: "iksolver"="..\..\iksolver\make\msvc_6_0\iksolver.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -192,7 +180,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "memutil"=..\..\memutil\make\msvc_60\memutil.dsp - Package Owner=<4>
+Project: "memutil"="..\..\memutil\make\msvc_60\memutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -204,7 +192,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "python_freeze"=..\..\python\freeze\python_freeze.dsp - Package Owner=<4>
+Project: "python_freeze"="..\..\python\freeze\python_freeze.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -216,7 +204,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "string"=..\..\string\make\msvc_6_0\string.dsp - Package Owner=<4>
+Project: "string"="..\..\string\make\msvc_6_0\string.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/intern/python/freeze/python_freeze.dsp b/intern/python/freeze/python_freeze.dsp
index ba065113544..b15312b9073 100644
--- a/intern/python/freeze/python_freeze.dsp
+++ b/intern/python/freeze/python_freeze.dsp
@@ -37,8 +37,9 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "..\..\..\..\obj\windows\intern\python_freeze\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\intern\python_freeze\"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -50,6 +51,11 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Freezing Blender Python
+PostBuild_Cmds=freeze.bat
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "python_freeze - Win32 Debug"