diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbfeedc..74965ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,13 +32,13 @@ jobs:
       shell: cmd
       run: |
         call MSVC600/VC98/Bin/vcvars32.bat
-        nmake
+        msdev Rebuilder.dsw /make
 
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v2.2.1
       with:
         path:
-          Rebuilder.exe
+          Rebuilder/Release/Rebuilder.exe
 
     - name: Upload to Releases
       shell: bash
@@ -49,4 +49,4 @@ jobs:
         TRAVIS_COMMIT: ${{ github.sha }}
       run: |
         curl -fLOSs --retry 2 --retry-delay 60 https://github.com/probonopd/uploadtool/raw/master/upload.sh
-        ./upload.sh Rebuilder.exe
+        ./upload.sh Rebuilder/Release/Rebuilder.exe
diff --git a/.gitignore b/.gitignore
index ba21892..5eeaf14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 build*
+Debug/
+Release/
 *.user
 *.obj
 *.dll
@@ -6,3 +8,6 @@ build*
 *.lib
 *.exe
 *.res
+*.plg
+*.ncb
+*.opt
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2e50355..0000000
--- a/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-CC = cl
-LD = link
-
-DLL_SOURCES = \
-  cmn/path.cpp \
-  lib/config.cpp \
-  lib/dllmain.cpp \
-  lib/hooks.cpp \
-  lib/mmpassthru.cpp \
-  lib/util.cpp \
-
-EXE_SOURCES = \
-  cmn/path.cpp \
-  ext/PropertyGrid/DynDialogEx.cpp \
-  ext/PropertyGrid/DynDialogItemEx.cpp \
-  ext/PropertyGrid/ListDynDialogEx.cpp \
-  ext/PropertyGrid/PropertyGrid.cpp \
-  ext/PropertyGrid/PropertyGridCombo.cpp \
-  ext/PropertyGrid/PropertyGridDirectoryPicker.cpp \
-  ext/PropertyGrid/PropertyGridInPlaceEdit.cpp \
-  ext/PropertyGrid/PropertyGridMonthCalCtrl.cpp \
-  ext/PropertyGrid/stdafx.cpp \
-  src/app.cpp \
-  src/clinkstatic.cpp \
-  src/launcher.cpp \
-  src/patchgrid.cpp \
-  src/tabs.cpp \
-  src/window.cpp \
-
-DLL_OBJECTS = $(DLL_SOURCES:.cpp=.obj)
-EXE_OBJECTS = $(EXE_SOURCES:.cpp=.obj)
-
-EXE = Rebuilder.exe
-DLL = Rebld.dll
-
-RES = res/res.res
-RES_SRC = res/res.rc
-
-$(EXE) : $(EXE_OBJECTS) $(RES)
-  $(LD) /out:$@ /subsystem:windows $** shlwapi.lib ddraw.lib dxguid.lib
-
-.cpp.obj :
-  $(CC) /nologo /Fo$@ -D_AFXDLL -MD -c $<
-
-$(DLL) : $(DLL_OBJECTS)
-  $(LD) /out:$@ /dll $** user32.lib winmm.lib shlwapi.lib advapi32.lib
-
-$(RES) : $(RES_SRC) $(DLL)
-
-clean :
-  del /s /q *.obj *.res *.dll *.exe *.exp *.lib *.res
\ No newline at end of file
diff --git a/Rebld/Rebld.dsp b/Rebld/Rebld.dsp
new file mode 100644
index 0000000..d5c2dec
--- /dev/null
+++ b/Rebld/Rebld.dsp
@@ -0,0 +1,113 @@
+# Microsoft Developer Studio Project File - Name="Rebld" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=REBLD - WIN32 RELEASE
+!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 "Rebld.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 "Rebld.mak" CFG="REBLD - WIN32 RELEASE"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Rebld - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "REBLD_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "REBLD_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /nologo /dll /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 shlwapi.lib winmm.lib /nologo /dll /machine:I386
+# Begin Target
+
+# Name "Rebld - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\lib\config.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\dllmain.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\hooks.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\mmpassthru.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmn\path.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\cmn\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\hooks.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmn\path.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\util.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/Rebuilder.dsw b/Rebuilder.dsw
new file mode 100644
index 0000000..e32f2e0
--- /dev/null
+++ b/Rebuilder.dsw
@@ -0,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Rebld"=.\Rebld\Rebld.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Rebuilder"=.\Rebuilder\Rebuilder.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Rebld
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/Rebuilder/Rebuilder.dsp b/Rebuilder/Rebuilder.dsp
new file mode 100644
index 0000000..9d6056d
--- /dev/null
+++ b/Rebuilder/Rebuilder.dsp
@@ -0,0 +1,221 @@
+# Microsoft Developer Studio Project File - Name="Rebuilder" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=REBUILDER - WIN32 RELEASE
+!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 "Rebuilder.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 "Rebuilder.mak" CFG="REBUILDER - WIN32 RELEASE"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Rebuilder - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 /nologo /subsystem:windows /machine:I386
+# ADD LINK32 shlwapi.lib ddraw.lib dxguid.lib /nologo /subsystem:windows /machine:I386
+# Begin Target
+
+# Name "Rebuilder - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\app.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\clinkstatic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\DynDialogEx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\DynDialogItemEx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\launcher.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\ListDynDialogEx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\patchgrid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmn\path.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGrid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridCombo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridDirectoryPicker.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridInPlaceEdit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridMonthCalCtrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\res\res.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\stdafx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\tabs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\window.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\src\app.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\clinkstatic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmn\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\CustomItem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\DynDialogEx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\DynDialogItemEx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\launcher.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\ListDynDialogEx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\patchgrid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmn\path.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGrid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridCombo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridDirectoryPicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridInPlaceEdit.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\PropertyGridMonthCalCtrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\res\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\PropertyGrid\stdafx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\tabs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\window.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\res\mama.ico
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\res\res.manifest
+# End Source File
+# End Target
+# End Project
diff --git a/res/res.rc b/res/res.rc
index 87f0886..58c6e2c 100644
--- a/res/res.rc
+++ b/res/res.rc
@@ -7,4 +7,4 @@ IDI_ICON1 ICON DISCARDABLE "mama.ico"
 1 RC_MANIFEST "res.manifest"
 
 // Include worker DLL in executable for better portability
-WORKER_DLL RCDATA "rebld.dll"
+WORKER_DLL RCDATA "../Rebld/Release/rebld.dll"