diff --git a/windows/BUILD_WIN32.TXT b/windows/nonAIO/BUILD_WIN32.TXT
similarity index 100%
rename from windows/BUILD_WIN32.TXT
rename to windows/nonAIO/BUILD_WIN32.TXT
diff --git a/windows/builder/build_GrampsWin32.py b/windows/nonAIO/builder/build_GrampsWin32.py
similarity index 100%
rename from windows/builder/build_GrampsWin32.py
rename to windows/nonAIO/builder/build_GrampsWin32.py
diff --git a/windows/builder/check_gtk_install.py b/windows/nonAIO/builder/check_gtk_install.py
similarity index 100%
rename from windows/builder/check_gtk_install.py
rename to windows/nonAIO/builder/check_gtk_install.py
diff --git a/windows/builder/gramps.png b/windows/nonAIO/builder/gramps.png
similarity index 100%
rename from windows/builder/gramps.png
rename to windows/nonAIO/builder/gramps.png
diff --git a/windows/builder/gramps2.nsi b/windows/nonAIO/builder/gramps2.nsi
similarity index 100%
rename from windows/builder/gramps2.nsi
rename to windows/nonAIO/builder/gramps2.nsi
diff --git a/windows/builder/make_launcher.py b/windows/nonAIO/builder/make_launcher.py
similarity index 100%
rename from windows/builder/make_launcher.py
rename to windows/nonAIO/builder/make_launcher.py
diff --git a/windows/builder/test_dependencies.py b/windows/nonAIO/builder/test_dependencies.py
similarity index 100%
rename from windows/builder/test_dependencies.py
rename to windows/nonAIO/builder/test_dependencies.py
diff --git a/windows/check_gtk_install.py b/windows/nonAIO/check_gtk_install.py
similarity index 100%
rename from windows/check_gtk_install.py
rename to windows/nonAIO/check_gtk_install.py
diff --git a/windows/nsis/README.txt b/windows/nonAIO/nsis/README.txt
similarity index 100%
rename from windows/nsis/README.txt
rename to windows/nonAIO/nsis/README.txt
diff --git a/windows/nsis/gcheck.py b/windows/nonAIO/nsis/gcheck.py
similarity index 100%
rename from windows/nsis/gcheck.py
rename to windows/nonAIO/nsis/gcheck.py
diff --git a/windows/nsis/gramps-build.bat b/windows/nonAIO/nsis/gramps-build.bat
similarity index 100%
rename from windows/nsis/gramps-build.bat
rename to windows/nonAIO/nsis/gramps-build.bat
diff --git a/windows/nsis/gramps.nsi b/windows/nonAIO/nsis/gramps.nsi
similarity index 100%
rename from windows/nsis/gramps.nsi
rename to windows/nonAIO/nsis/gramps.nsi
diff --git a/windows/nsis/ped24.ico b/windows/nonAIO/nsis/ped24.ico
similarity index 100%
rename from windows/nsis/ped24.ico
rename to windows/nonAIO/nsis/ped24.ico