diff --git a/stepmania/MSVCP60D.DLL b/stepmania/MSVCP60D.DLL
deleted file mode 100644
index 899562cfe1..0000000000
Binary files a/stepmania/MSVCP60D.DLL and /dev/null differ
diff --git a/stepmania/MSVCP70.DLL b/stepmania/MSVCP70.DLL
deleted file mode 100644
index 755438f7b5..0000000000
Binary files a/stepmania/MSVCP70.DLL and /dev/null differ
diff --git a/stepmania/MSVCP70D.DLL b/stepmania/MSVCP70D.DLL
deleted file mode 100644
index 359a2995de..0000000000
Binary files a/stepmania/MSVCP70D.DLL and /dev/null differ
diff --git a/stepmania/MSVCR70D.DLL b/stepmania/MSVCR70D.DLL
deleted file mode 100644
index f51e9d9424..0000000000
Binary files a/stepmania/MSVCR70D.DLL and /dev/null differ
diff --git a/stepmania/MSVCRTD.DLL b/stepmania/MSVCRTD.DLL
deleted file mode 100644
index d24bc0e16c..0000000000
Binary files a/stepmania/MSVCRTD.DLL and /dev/null differ
diff --git a/stepmania/SDL.dll b/stepmania/SDL.dll
deleted file mode 100644
index fe81f1c478..0000000000
Binary files a/stepmania/SDL.dll and /dev/null differ
diff --git a/stepmania/SDL_image.dll b/stepmania/SDL_image.dll
deleted file mode 100644
index 4d8b60f68e..0000000000
Binary files a/stepmania/SDL_image.dll and /dev/null differ
diff --git a/stepmania/SDL_imaged.dll b/stepmania/SDL_imaged.dll
deleted file mode 100644
index 79f0def79b..0000000000
Binary files a/stepmania/SDL_imaged.dll and /dev/null differ
diff --git a/stepmania/SDL_net.dll b/stepmania/SDL_net.dll
deleted file mode 100644
index e1e57d622b..0000000000
Binary files a/stepmania/SDL_net.dll and /dev/null differ
diff --git a/stepmania/SDLd.dll b/stepmania/SDLd.dll
deleted file mode 100644
index 5bfd242eb5..0000000000
Binary files a/stepmania/SDLd.dll and /dev/null differ
diff --git a/stepmania/avcodec.dll b/stepmania/avcodec.dll
deleted file mode 100644
index 72be82cefa..0000000000
Binary files a/stepmania/avcodec.dll and /dev/null differ
diff --git a/stepmania/avformat.dll b/stepmania/avformat.dll
deleted file mode 100644
index 63ead52e40..0000000000
Binary files a/stepmania/avformat.dll and /dev/null differ
diff --git a/stepmania/dbghelp.dll b/stepmania/dbghelp.dll
deleted file mode 100644
index ea072ef17a..0000000000
Binary files a/stepmania/dbghelp.dll and /dev/null differ
diff --git a/stepmania/jpeg.dll b/stepmania/jpeg.dll
deleted file mode 100644
index 1f3c43cb71..0000000000
Binary files a/stepmania/jpeg.dll and /dev/null differ
diff --git a/stepmania/msvcr70.dll b/stepmania/msvcr70.dll
deleted file mode 100644
index 2ef28fdd09..0000000000
Binary files a/stepmania/msvcr70.dll and /dev/null differ
diff --git a/stepmania/parallel_lights_io.dll b/stepmania/parallel_lights_io.dll
deleted file mode 100644
index 03f557f1f4..0000000000
Binary files a/stepmania/parallel_lights_io.dll and /dev/null differ
diff --git a/stepmania/resample.dll b/stepmania/resample.dll
deleted file mode 100644
index a6f309459e..0000000000
Binary files a/stepmania/resample.dll and /dev/null differ
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 2b555e02b3..bc7b7881eb 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -58,14 +58,14 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 $(intdir)\verstub.obj kernel32.lib shell32.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
 # SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
-# ADD LINK32 $(intdir)\verstub.obj kernel32.lib gdi32.lib shell32.lib user32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
+# ADD LINK32 $(intdir)\verstub.obj kernel32.lib gdi32.lib shell32.lib user32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /out:"../Program/StepMania-debug.exe"
 # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # Begin Special Build Tool
 IntDir=.\../Debug6
-TargetDir=\temp\stepmania
+TargetDir=\temp\stepmania\Program
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc              	cl              /Zl              /nologo              /c              verstub.cpp              /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc               	cl               /Zl               /nologo               /c               verstub.cpp               /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -82,24 +82,24 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP
-# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP
-XBE=imagebld.exe
-# ADD BASE XBE /nologo /stack:0x10000 /debug
-# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe"
 XBCP=xbecopy.exe
 # ADD BASE XBCP /NOLOGO
 # ADD XBCP /NOLOGO
+XBE=imagebld.exe
+# ADD BASE XBE /nologo /stack:0x10000 /debug
+# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe"
+LINK32=link.exe
+# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP
+# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c
 # Begin Special Build Tool
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                           	cl                                                                                                                                                                                                                            /Zl                                                                                                                                                                                                                            /nologo                                                                                                                                                                                                                            /c                                                                                                                                                                                                                            verstub.cpp \
-                                                                                                                                                                                                                                                        /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                            	cl                                                                                                                                                                                                                             /Zl                                                                                                                                                                                                                             /nologo                                                                                                                                                                                                                             /c                                                                                                                                                                                                                             verstub.cpp \
+                                                                                                                                                                                                                                                          /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -132,14 +132,14 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 $(intdir)\verstub.obj kernel32.lib gdi32.lib shell32.lib user32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /pdb:"../release6/StepMania.pdb" /map /debug /machine:I386
 # SUBTRACT BASE LINK32 /verbose /pdb:none
-# ADD LINK32 $(intdir)\verstub.obj kernel32.lib gdi32.lib shell32.lib user32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /out:"../StepMania.exe"
+# ADD LINK32 $(intdir)\verstub.obj kernel32.lib gdi32.lib shell32.lib user32.lib advapi32.lib winmm.lib /nologo /subsystem:windows /map /debug /machine:I386 /out:"../Program/StepMania.exe"
 # SUBTRACT LINK32 /verbose /pdb:none
 # Begin Special Build Tool
 IntDir=.\../Release6
-TargetDir=\temp\stepmania
+TargetDir=\temp\stepmania\Program
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc               	cl                /Zl                /nologo                /c                verstub.cpp                /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                	cl                 /Zl                 /nologo                 /c                 verstub.cpp                 /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -157,27 +157,27 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Intermediate_Dir "StepMania___Xbox_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c
-# SUBTRACT CPP /Fr
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+XBCP=xbecopy.exe
+# ADD BASE XBCP /NOLOGO
+# ADD XBCP /NOLOGO
+XBE=imagebld.exe
+# ADD BASE XBE /nologo /stack:0x10000 /debug
+# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
 LINK32=link.exe
 # ADD BASE LINK32 $(intdir)\verstub.obj xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
 # SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # ADD LINK32 $(intdir)\verstub.obj xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xnet.lib xboxkrnl.lib libcmt.lib /nologo /incremental:no /pdb:"../release6xbox/StepMania.pdb" /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"../StepManiaXbox.exe" /subsystem:xbox /fixed:no /TMP /OPT:REF
 # SUBTRACT LINK32 /pdb:none /map /debug
-XBE=imagebld.exe
-# ADD BASE XBE /nologo /stack:0x10000 /debug
-# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
-XBCP=xbecopy.exe
-# ADD BASE XBCP /NOLOGO
-# ADD XBCP /NOLOGO
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c
+# SUBTRACT CPP /Fr
 # Begin Special Build Tool
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                            	cl                                                                                                                                                                                                                             /Zl                                                                                                                                                                                                                             /nologo                                                                                                                                                                                                                             /c                                                                                                                                                                                                                             verstub.cpp \
-                                                                                                                                                                                                                                                          /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                             	cl                                                                                                                                                                                                                              /Zl                                                                                                                                                                                                                              /nologo                                                                                                                                                                                                                              /c                                                                                                                                                                                                                              verstub.cpp \
+                                                                                                                                                                                                                                                            /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 423dfc8339..2070885116 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -13,8 +13,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\.."
-			IntermediateDirectory=".\../Debug"
+			OutputDirectory="./../Program"
+			IntermediateDirectory="./../Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
-				OutputFile="../StepMania-debug.exe"
+				OutputFile="../Program/StepMania-debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -82,7 +82,7 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="./.."
+			OutputDirectory="./../Program"
 			IntermediateDirectory="./../Release"
 			ConfigurationType="1"
 			UseOfMFC="0"
@@ -122,7 +122,7 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
-				OutputFile=".\../StepMania.exe"
+				OutputFile=".\../Program/StepMania.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
diff --git a/stepmania/src/smpackage/smpackage.dsp b/stepmania/src/smpackage/smpackage.dsp
index b7a1203268..e8808d23f3 100644
--- a/stepmania/src/smpackage/smpackage.dsp
+++ b/stepmania/src/smpackage/smpackage.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 6
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../"
+# PROP Output_Dir "../../Program/"
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -64,7 +64,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 6
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../"
+# PROP Output_Dir "../../Program/"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /out:"../../smpackage-debug.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /out:"../../Program/smpackage-debug.exe" /pdbtype:sept
 
 !ENDIF 
 
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index 029504599e..80e09012b9 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -14,18 +14,7 @@
 !include "src\ProductInfo.inc"
 
 !system "echo This may take a moment ..." ignore
-!system "utils\upx StepMania.exe" ignore
-!system "utils\upx smpackage.exe" ignore
-!system "utils\upx msvcr70.dll" ignore
-!system "utils\upx msvcp70.dll" ignore
-!system "utils\upx jpeg.dll" ignore
-!system "utils\upx SDL.dll" ignore
-!system "utils\upx SDL_image.dll" ignore
-!system "utils\upx avcodec.dll" ignore
-!system "utils\upx avformat.dll" ignore
-!system "utils\upx resample.dll" ignore
-!system "utils\upx dbghelp.dll" ignore
-!system "utils\upx zlib1.dll" ignore
+!system "utils\upx Program\*.exe Program\*.dll" ignore
 
 Name "${PRODUCT_NAME_VER}"
 OutFile "${PRODUCT_NAME_VER}.exe"
@@ -66,6 +55,14 @@ do_uninstall_nsis:
 Exec "$INSTDIR\uninst.exe"
 old_nsis_not_installed:
 
+IfFileExists "$INSTDIR\Program\uninst.exe" prompt_uninstall_nsis2 old_nsis_not_installed2
+prompt_uninstall_nsis2:
+MessageBox MB_YESNO|MB_ICONINFORMATION "The previous version of StepMania must be uninstalled before continuing.$\nDo you wish to continue?" IDYES do_uninstall_nsis2
+Abort
+do_uninstall_nsis2:
+Exec "$INSTDIR\Program\uninst.exe"
+old_nsis_not_installed2:
+
 ; Check for DirectX 8.0 (to be moved to the right section later)
 ; We only use this for sound.  Actually, I could probably make the sound
 ; work with an earlier one; I'm not sure if that's needed or not.  For one
@@ -101,17 +98,17 @@ Section ""
 ; write out uninstaller
 SetOutPath "$INSTDIR"
 SetOverwrite on
-WriteUninstaller "$INSTDIR\uninst.exe"
+WriteUninstaller "$INSTDIR\Program\uninst.exe"
 
 ; add registry entries
 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\StepMania\${PRODUCT_ID}" "" "$INSTDIR"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "DisplayName" "${PRODUCT_ID} (remove only)"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "UninstallString" '"$INSTDIR\uninst.exe"'
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "UninstallString" '"$INSTDIR\Program\uninst.exe"'
 
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\Applications\smpackage.exe\shell\open\command" "" '"$INSTDIR\smpackage.exe" "%1"'
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\Applications\smpackage.exe\shell\open\command" "" '"$INSTDIR\Program\smpackage.exe" "%1"'
 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile" "" "SMZIP package"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\DefaultIcon" "" "$INSTDIR\smpackage.exe,0"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\shell\open\command" "" '"$INSTDIR\smpackage.exe" "%1"'
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\DefaultIcon" "" "$INSTDIR\Program\smpackage.exe,0"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\shell\open\command" "" '"$INSTDIR\Program\smpackage.exe" "%1"'
 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\.smzip" "" "smzipfile"
 
 ; Begin copying files
@@ -197,24 +194,25 @@ File "Data\AI.ini"
 File "Data\Unlocks.dat"
 File "Data\splash.bmp"
 
-SetOutPath "$INSTDIR"
-File "msvcr70.dll"
-File "msvcp70.dll"
-File "jpeg.dll"
-File "SDL.dll"
-File "SDL_image.dll"
-File "avcodec.dll"
-File "avformat.dll"
-File "resample.dll"
-File "dbghelp.dll"
-File "zlib1.dll"
+SetOutPath "$INSTDIR\Program"
+File "Program\stepmania.exe"
+File "Program\stepmania.vdi"
+File "Program\smpackage.exe"
+File "Program\msvcr70.dll"
+File "Program\msvcp70.dll"
+File "Program\jpeg.dll"
+File "Program\SDL.dll"
+File "Program\SDL_image.dll"
+File "Program\avcodec.dll"
+File "Program\avformat.dll"
+File "Program\resample.dll"
+File "Program\dbghelp.dll"
+File "Program\zlib1.dll"
 
+SetOutPath "$INSTDIR"
 File "COPYING.txt"
 File "README-FIRST.html"
 File "NEWS"
-File "stepmania.exe"
-File "stepmania.vdi"
-File "smpackage.exe"
 
 ; What to do here?  Better to just delete an existing INI than to
 ; drop the local one in ... -glenn
@@ -241,13 +239,13 @@ File "smpackage.exe"
 ; Create Start Menu icons
 SetShellVarContext current  # 	'all' doesn't work on Win9x
 CreateDirectory "$SMPROGRAMS\${PRODUCT_ID}\"
-CreateShortCut "$DESKTOP\Play ${PRODUCT_NAME_VER}.lnk" "$INSTDIR\stepmania.exe"
-CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\${PRODUCT_NAME_VER}.lnk" "$INSTDIR\stepmania.exe"
+CreateShortCut "$DESKTOP\Play ${PRODUCT_NAME_VER}.lnk" "$INSTDIR\Program\stepmania.exe"
+CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\${PRODUCT_NAME_VER}.lnk" "$INSTDIR\Program\stepmania.exe"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Open StepMania Program Folder.lnk" "$WINDIR\explorer.exe" "$INSTDIR\"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\View Statistics.lnk" "$INSTDIR\Data\MachineProfile\stats.html"
-CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\StepMania Tools and Package Exporter.lnk" "$INSTDIR\smpackage.exe"
+CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\StepMania Tools and Package Exporter.lnk" "$INSTDIR\Program\smpackage.exe"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\README-FIRST.lnk" "$INSTDIR\README-FIRST.html"
-CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Uninstall ${PRODUCT_NAME_VER}.lnk" "$INSTDIR\uninst.exe"
+CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Uninstall ${PRODUCT_NAME_VER}.lnk" "$INSTDIR\Program\uninst.exe"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Go To StepMania web site.lnk" "http://www.stepmania.com"
 
 # We want to delete a few old desktop icons, since they weren't being
@@ -274,7 +272,7 @@ UninstallText "This will uninstall StepMania from your system.$\nAny add-on pack
 Section Uninstall
 
 ; add delete commands to delete whatever files/registry keys/etc you installed here.
-Delete "$INSTDIR\uninst.exe"
+Delete "$INSTDIR\Program\uninst.exe"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\StepMania\${PRODUCT_ID}"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}"
 
@@ -345,22 +343,23 @@ Delete "$INSTDIR\Data\GamePrefs.ini"
 Delete "$INSTDIR\Data\splash.bmp"
 RMDir "$INSTDIR\Data"
 
-Delete "$INSTDIR\msvcr70.dll"
-Delete "$INSTDIR\msvcp70.dll"
-Delete "$INSTDIR\jpeg.dll"
-Delete "$INSTDIR\SDL.dll"
-Delete "$INSTDIR\SDL_image.dll"
-Delete "$INSTDIR\avcodec.dll"
-Delete "$INSTDIR\avformat.dll"
-Delete "$INSTDIR\resample.dll"
-Delete "$INSTDIR\dbghelp.dll"
-Delete "$INSTDIR\zlib1.dll"
+Delete "$INSTDIR\Program\stepmania.exe"
+Delete "$INSTDIR\Program\smpackage.exe"
+Delete "$INSTDIR\Program\StepMania.vdi"
+Delete "$INSTDIR\Program\msvcr70.dll"
+Delete "$INSTDIR\Program\msvcp70.dll"
+Delete "$INSTDIR\Program\jpeg.dll"
+Delete "$INSTDIR\Program\SDL.dll"
+Delete "$INSTDIR\Program\SDL_image.dll"
+Delete "$INSTDIR\Program\avcodec.dll"
+Delete "$INSTDIR\Program\avformat.dll"
+Delete "$INSTDIR\Program\resample.dll"
+Delete "$INSTDIR\Program\dbghelp.dll"
+Delete "$INSTDIR\Program\zlib1.dll"
 Delete "$INSTDIR\COPYING.txt"
 Delete "$INSTDIR\README-FIRST.html"
 Delete "$INSTDIR\NEWS"
-Delete "$INSTDIR\stepmania.exe"
-Delete "$INSTDIR\smpackage.exe"
-Delete "$INSTDIR\StepMania.vdi"
+RMDir "$INSTDIR\Program"
 Delete "$INSTDIR\log.txt"
 Delete "$INSTDIR\info.txt"
 Delete "$INSTDIR\crashinfo.txt"
diff --git a/stepmania/zlib1.dll b/stepmania/zlib1.dll
deleted file mode 100644
index 9727aeccb0..0000000000
Binary files a/stepmania/zlib1.dll and /dev/null differ