diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 62f5467..e4983fc 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -50,11 +50,11 @@ jobs:
       working-directory: out/release
 
     - name: Package
-      working-directory: installer
-      run: ./make-installer.sh ../out/release ${{ matrix.installer }}.nsi
+      working-directory: tools/installer
+      run: ./make-installer.sh ../../out/release ${{ matrix.installer }}.nsi
 
     - name: Upload
       uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.installer }}
-        path: installer/${{ matrix.installer }}.exe
+        path: tools/installer/${{ matrix.installer }}.exe
diff --git a/installer/make-installer.sh b/tools/installer/make-installer.sh
similarity index 100%
rename from installer/make-installer.sh
rename to tools/installer/make-installer.sh
diff --git a/installer/xsystem35-32bit.nsi b/tools/installer/xsystem35-32bit.nsi
similarity index 100%
rename from installer/xsystem35-32bit.nsi
rename to tools/installer/xsystem35-32bit.nsi
diff --git a/installer/xsystem35-64bit.nsi b/tools/installer/xsystem35-64bit.nsi
similarity index 100%
rename from installer/xsystem35-64bit.nsi
rename to tools/installer/xsystem35-64bit.nsi
diff --git a/installer/xsystem35.nsi b/tools/installer/xsystem35.nsi
similarity index 95%
rename from installer/xsystem35.nsi
rename to tools/installer/xsystem35.nsi
index 886ddff..4246043 100644
--- a/installer/xsystem35.nsi
+++ b/tools/installer/xsystem35.nsi
@@ -11,7 +11,7 @@ Page instfiles
 UninstPage uninstConfirm
 UninstPage instfiles
 
-LicenseData ..\COPYING
+LicenseData ..\..\COPYING
 
 !define SHCNE_ASSOCCHANGED 0x08000000
 !define SHCNF_IDLIST 0
@@ -25,9 +25,10 @@ Section
 	FILE ${BUILDDIR}\src\xsystem35.exe
 	!include ${BUILDDIR}\dlls.nsi
 	SetOutPath $INSTDIR\fonts
-	FILE /x CMakeLists.txt ..\fonts\*.*
+	FILE /x CMakeLists.txt ..\..\fonts\*.*
 	WriteUninstaller $INSTDIR\uninstall.exe
 
+	WriteRegStr HKLM "Software\Kichikuou\xsystem35" "InstallDir" "$INSTDIR"
 	WriteRegStr HKLM "Software\Kichikuou\xsystem35\profile" "ttfont_gothic" "$INSTDIR\fonts\MTLc3m.ttf"
 	WriteRegStr HKLM "Software\Kichikuou\xsystem35\profile" "ttfont_mincho" "$INSTDIR\fonts\mincho.otf"