diff --git a/Read Me.txt b/README.txt
similarity index 100%
rename from Read Me.txt
rename to README.txt
diff --git a/Viewer.exe b/dist/win32/Viewer.exe
similarity index 100%
rename from Viewer.exe
rename to dist/win32/Viewer.exe
diff --git a/cfg.ini b/dist/win32/cfg.ini
similarity index 100%
rename from cfg.ini
rename to dist/win32/cfg.ini
diff --git a/hex.exe b/dist/win32/hex.exe
similarity index 100%
rename from hex.exe
rename to dist/win32/hex.exe
diff --git a/global/credits.txt b/src/main/resources/credits.txt
similarity index 100%
rename from global/credits.txt
rename to src/main/resources/credits.txt
diff --git a/global/gfx/images/backgrounds/imageafter-1.jpg b/src/main/resources/gfx/images/backgrounds/imageafter-1.jpg
similarity index 100%
rename from global/gfx/images/backgrounds/imageafter-1.jpg
rename to src/main/resources/gfx/images/backgrounds/imageafter-1.jpg
diff --git a/global/gfx/images/backgrounds/imageafter-2.jpg b/src/main/resources/gfx/images/backgrounds/imageafter-2.jpg
similarity index 100%
rename from global/gfx/images/backgrounds/imageafter-2.jpg
rename to src/main/resources/gfx/images/backgrounds/imageafter-2.jpg
diff --git a/global/gfx/images/backgrounds/imageafter-3.jpg b/src/main/resources/gfx/images/backgrounds/imageafter-3.jpg
similarity index 100%
rename from global/gfx/images/backgrounds/imageafter-3.jpg
rename to src/main/resources/gfx/images/backgrounds/imageafter-3.jpg
diff --git a/global/gfx/images/backgrounds/imageafter-4.jpg b/src/main/resources/gfx/images/backgrounds/imageafter-4.jpg
similarity index 100%
rename from global/gfx/images/backgrounds/imageafter-4.jpg
rename to src/main/resources/gfx/images/backgrounds/imageafter-4.jpg
diff --git a/global/gfx/images/backgrounds/imageafter-5.jpg b/src/main/resources/gfx/images/backgrounds/imageafter-5.jpg
similarity index 100%
rename from global/gfx/images/backgrounds/imageafter-5.jpg
rename to src/main/resources/gfx/images/backgrounds/imageafter-5.jpg
diff --git a/global/gfx/images/logos/gpl_logo_grey_127x51.png b/src/main/resources/gfx/images/logos/gpl_logo_grey_127x51.png
similarity index 100%
rename from global/gfx/images/logos/gpl_logo_grey_127x51.png
rename to src/main/resources/gfx/images/logos/gpl_logo_grey_127x51.png
diff --git a/global/gfx/images/logos/gpl_logo_red_127x51.png b/src/main/resources/gfx/images/logos/gpl_logo_red_127x51.png
similarity index 100%
rename from global/gfx/images/logos/gpl_logo_red_127x51.png
rename to src/main/resources/gfx/images/logos/gpl_logo_red_127x51.png
diff --git a/global/gfx/images/logos/gpl_logo_red_88x31.png b/src/main/resources/gfx/images/logos/gpl_logo_red_88x31.png
similarity index 100%
rename from global/gfx/images/logos/gpl_logo_red_88x31.png
rename to src/main/resources/gfx/images/logos/gpl_logo_red_88x31.png
diff --git a/global/gfx/images/logos/tophatstuff_238x44.png b/src/main/resources/gfx/images/logos/tophatstuff_238x44.png
similarity index 100%
rename from global/gfx/images/logos/tophatstuff_238x44.png
rename to src/main/resources/gfx/images/logos/tophatstuff_238x44.png
diff --git a/global/gfx/images/title2.png b/src/main/resources/gfx/images/title2.png
similarity index 100%
rename from global/gfx/images/title2.png
rename to src/main/resources/gfx/images/title2.png
diff --git a/global/music/Kevin McLeod - Finding the Balance.mp3 b/src/main/resources/music/Kevin McLeod - Finding the Balance.mp3
similarity index 100%
rename from global/music/Kevin McLeod - Finding the Balance.mp3
rename to src/main/resources/music/Kevin McLeod - Finding the Balance.mp3
diff --git a/global/nyi.txt b/src/main/resources/nyi.txt
similarity index 100%
rename from global/nyi.txt
rename to src/main/resources/nyi.txt
diff --git a/global/paths.ini b/src/main/resources/paths.ini
similarity index 100%
rename from global/paths.ini
rename to src/main/resources/paths.ini
diff --git a/src/Read Me.txt b/src/main/win32/Read Me.txt
similarity index 100%
rename from src/Read Me.txt
rename to src/main/win32/Read Me.txt
diff --git a/src/Viewer.cps b/src/main/win32/Viewer.cps
similarity index 100%
rename from src/Viewer.cps
rename to src/main/win32/Viewer.cps
diff --git a/src/hag.20100711.slim.GPL-compatible/Hag Online Documentation.url b/src/main/win32/hag.20100711.slim.GPL-compatible/Hag Online Documentation.url
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/Hag Online Documentation.url
rename to src/main/win32/hag.20100711.slim.GPL-compatible/Hag Online Documentation.url
diff --git a/src/hag.20100711.slim.GPL-compatible/ReadMe.txt b/src/main/win32/hag.20100711.slim.GPL-compatible/ReadMe.txt
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/ReadMe.txt
rename to src/main/win32/hag.20100711.slim.GPL-compatible/ReadMe.txt
diff --git a/src/hag.20100711.slim.GPL-compatible/changes.txt b/src/main/win32/hag.20100711.slim.GPL-compatible/changes.txt
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/changes.txt
rename to src/main/win32/hag.20100711.slim.GPL-compatible/changes.txt
diff --git a/src/hag.20100711.slim.GPL-compatible/hag-license.txt b/src/main/win32/hag.20100711.slim.GPL-compatible/hag-license.txt
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag-license.txt
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag-license.txt
diff --git a/src/hag.20100711.slim.GPL-compatible/hag.ver b/src/main/win32/hag.20100711.slim.GPL-compatible/hag.ver
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag.ver
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag.ver
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/Compile Themes.bat b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/Compile Themes.bat
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/Compile Themes.bat
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/Compile Themes.bat
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/ThemeCompiler.cps b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/ThemeCompiler.cps
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/ThemeCompiler.cps
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/ThemeCompiler.cps
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/basilisk-license.txt b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/basilisk-license.txt
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/basilisk-license.txt
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/basilisk-license.txt
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/basilisk.cps b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/basilisk.cps
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/basilisk.cps
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/basilisk.cps
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/basilisk.ver b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/basilisk.ver
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/basilisk.ver
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/basilisk.ver
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/const.bsd b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/const.bsd
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/const.bsd
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/const.bsd
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/hag-license.txt b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/hag-license.txt
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/hag-license.txt
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/hag-license.txt
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/icons/gear.ico b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/gear.ico
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/icons/gear.ico
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/gear.ico
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_hand.png b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_hand.png
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_hand.png
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_hand.png
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_text.png b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_text.png
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_text.png
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/cursor_text.png
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/icons/img/smiley.png b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/smiley.png
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/icons/img/smiley.png
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/smiley.png
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/icons/img/unsmiley.png b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/unsmiley.png
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/icons/img/unsmiley.png
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/img/unsmiley.png
diff --git a/src/hag.20100711.slim.GPL-compatible/hag/icons/window.ico b/src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/window.ico
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hag/icons/window.ico
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hag/icons/window.ico
diff --git a/src/hag.20100711.slim.GPL-compatible/hagC2D.cps b/src/main/win32/hag.20100711.slim.GPL-compatible/hagC2D.cps
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hagC2D.cps
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hagC2D.cps
diff --git a/src/hag.20100711.slim.GPL-compatible/hagC3D.cps b/src/main/win32/hag.20100711.slim.GPL-compatible/hagC3D.cps
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hagC3D.cps
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hagC3D.cps
diff --git a/src/hag.20100711.slim.GPL-compatible/hagP2D.cps b/src/main/win32/hag.20100711.slim.GPL-compatible/hagP2D.cps
similarity index 100%
rename from src/hag.20100711.slim.GPL-compatible/hagP2D.cps
rename to src/main/win32/hag.20100711.slim.GPL-compatible/hagP2D.cps
diff --git a/src/hex.cps b/src/main/win32/hex.cps
similarity index 100%
rename from src/hex.cps
rename to src/main/win32/hex.cps
diff --git a/src/hexCommon.cps b/src/main/win32/hexCommon.cps
similarity index 100%
rename from src/hexCommon.cps
rename to src/main/win32/hexCommon.cps
diff --git a/src/hexTextwrap.cps b/src/main/win32/hexTextwrap.cps
similarity index 100%
rename from src/hexTextwrap.cps
rename to src/main/win32/hexTextwrap.cps
diff --git a/src/hexWorldgen.cps b/src/main/win32/hexWorldgen.cps
similarity index 100%
rename from src/hexWorldgen.cps
rename to src/main/win32/hexWorldgen.cps
diff --git a/src/hexWorldgen_backend.cps b/src/main/win32/hexWorldgen_backend.cps
similarity index 100%
rename from src/hexWorldgen_backend.cps
rename to src/main/win32/hexWorldgen_backend.cps
diff --git a/src/lexini.20100711.slim/lexini.cps b/src/main/win32/lexini.20100711.slim/lexini.cps
similarity index 100%
rename from src/lexini.20100711.slim/lexini.cps
rename to src/main/win32/lexini.20100711.slim/lexini.cps
diff --git a/src/sr3a.cpp b/src/main/win32/sr3a.cpp
similarity index 100%
rename from src/sr3a.cpp
rename to src/main/win32/sr3a.cpp