diff --git a/Makefile b/Makefile
index 48ade77..9f0fa5f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ mk_COptions = $(mk_COptionsCommon) -Os
 
 TheDefaultOutput : minivmac.exe
 
-bld/OSGLUWIN.o : src/OSGLUWIN.c src/STRCNENG.h cfg/STRCONST.h src/INTLCHAR.h src/COMOSGLU.h src/CONTROLM.h cfg/CNFGGLOB.h
-	gcc "src/OSGLUWIN.c" -o "bld/OSGLUWIN.o" $(mk_COptions)
+bld/OSGLUWIN.o : src/UI/WIN32/OSGLUWIN.c src/STRCNENG.h cfg/STRCONST.h src/INTLCHAR.h src/COMOSGLU.h src/CONTROLM.h cfg/CNFGGLOB.h
+	gcc "src/UI/WIN32/OSGLUWIN.c" -o "bld/OSGLUWIN.o" $(mk_COptions)
 bld/GLOBGLUE.o : src/GLOBGLUE.c cfg/CNFGGLOB.h
 	gcc "src/GLOBGLUE.c" -o "bld/GLOBGLUE.o" $(mk_COptions)
 bld/M68KITAB.o : src/M68KITAB.c cfg/CNFGGLOB.h
@@ -60,8 +60,8 @@ ObjFiles = \
 	bld/PROGMAIN.o \
 
 
-bld/: cfg/main.rc
-	windres.exe -i "cfg/main.rc" --input-format=rc -o "bld/" -O coff  --include-dir SRC
+bld/main.res: src/UI/WIN32/main.rc
+	windres.exe -i "src/UI/WIN32/main.rc" --input-format=rc -o "bld/main.res" -O coff  --include-dir SRC
 
 
 minivmac.exe : $(ObjFiles) bld/
diff --git a/cfg/main.rc b/cfg/main.rc
deleted file mode 100644
index bf95788..0000000
--- a/cfg/main.rc
+++ /dev/null
@@ -1 +0,0 @@
-256                     ICON    DISCARDABLE     "ICONAPPW.ico"
diff --git a/src/ADBEMDEV.c b/src/ADBEMDEV.c
index 9b40385..ac95ebd 100644
--- a/src/ADBEMDEV.c
+++ b/src/ADBEMDEV.c
@@ -20,7 +20,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
diff --git a/src/ASCEMDEV.c b/src/ASCEMDEV.c
index 2d2f453..d617280 100644
--- a/src/ASCEMDEV.c
+++ b/src/ASCEMDEV.c
@@ -21,7 +21,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "VIAEMDEV.h"
diff --git a/src/DISAM68K.c b/src/DISAM68K.c
index 9659108..f934012 100644
--- a/src/DISAM68K.c
+++ b/src/DISAM68K.c
@@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 
 #include "ENDIANAC.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 
diff --git a/src/GLOBGLUE.c b/src/GLOBGLUE.c
index cf3fa41..ceb0a0c 100644
--- a/src/GLOBGLUE.c
+++ b/src/GLOBGLUE.c
@@ -27,7 +27,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #endif
diff --git a/src/IWMEMDEV.c b/src/IWMEMDEV.c
index 544f2db..aa062fa 100644
--- a/src/IWMEMDEV.c
+++ b/src/IWMEMDEV.c
@@ -32,7 +32,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
diff --git a/src/KBRDEMDV.c b/src/KBRDEMDV.c
index 20a6ee6..064b2e3 100644
--- a/src/KBRDEMDV.c
+++ b/src/KBRDEMDV.c
@@ -24,7 +24,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
diff --git a/src/M68KITAB.c b/src/M68KITAB.c
index 6a8b266..bfa114b 100644
--- a/src/M68KITAB.c
+++ b/src/M68KITAB.c
@@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 #endif
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 
diff --git a/src/MINEM68K.c b/src/MINEM68K.c
index ed99839..c739395 100644
--- a/src/MINEM68K.c
+++ b/src/MINEM68K.c
@@ -33,7 +33,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
diff --git a/src/MOUSEMDV.c b/src/MOUSEMDV.c
index a3d6ac0..5abedef 100644
--- a/src/MOUSEMDV.c
+++ b/src/MOUSEMDV.c
@@ -25,7 +25,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
diff --git a/src/PMUEMDEV.c b/src/PMUEMDEV.c
index 4357974..d4d08b4 100644
--- a/src/PMUEMDEV.c
+++ b/src/PMUEMDEV.c
@@ -20,7 +20,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "VIAEMDEV.h"
diff --git a/src/PROGMAIN.c b/src/PROGMAIN.c
index 2451559..9083f8c 100644
--- a/src/PROGMAIN.c
+++ b/src/PROGMAIN.c
@@ -21,7 +21,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "M68KITAB.h"
diff --git a/src/ROMEMDEV.c b/src/ROMEMDEV.c
index 53471a1..a155fc0 100644
--- a/src/ROMEMDEV.c
+++ b/src/ROMEMDEV.c
@@ -27,7 +27,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
diff --git a/src/RTCEMDEV.c b/src/RTCEMDEV.c
index a4165e0..49f703e 100644
--- a/src/RTCEMDEV.c
+++ b/src/RTCEMDEV.c
@@ -24,7 +24,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
diff --git a/src/SCCEMDEV.c b/src/SCCEMDEV.c
index 011c6e6..b1723df 100644
--- a/src/SCCEMDEV.c
+++ b/src/SCCEMDEV.c
@@ -41,7 +41,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
diff --git a/src/SCRNEMDV.c b/src/SCRNEMDV.c
index 29221ab..616e03a 100644
--- a/src/SCRNEMDV.c
+++ b/src/SCRNEMDV.c
@@ -26,7 +26,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
diff --git a/src/SCSIEMDV.c b/src/SCSIEMDV.c
index 53ccd59..35e6e71 100644
--- a/src/SCSIEMDV.c
+++ b/src/SCSIEMDV.c
@@ -28,7 +28,7 @@
 #include "SYSDEPNS.h"
 
 #include "ENDIANAC.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "MINEM68K.h"
diff --git a/src/SNDEMDEV.c b/src/SNDEMDEV.c
index 4088172..e39c2f5 100644
--- a/src/SNDEMDEV.c
+++ b/src/SNDEMDEV.c
@@ -25,7 +25,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #include "MINEM68K.h"
diff --git a/src/SONYEMDV.c b/src/SONYEMDV.c
index 3e464ab..1b64ec8 100644
--- a/src/SONYEMDV.c
+++ b/src/SONYEMDV.c
@@ -30,7 +30,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
diff --git a/src/ICONAPPO.icns b/src/UI/MACOSX/ICONAPPO.icns
similarity index 100%
rename from src/ICONAPPO.icns
rename to src/UI/MACOSX/ICONAPPO.icns
diff --git a/src/ICONDSKO.icns b/src/UI/MACOSX/ICONDSKO.icns
similarity index 100%
rename from src/ICONDSKO.icns
rename to src/UI/MACOSX/ICONDSKO.icns
diff --git a/src/ICONROMO.icns b/src/UI/MACOSX/ICONROMO.icns
similarity index 100%
rename from src/ICONROMO.icns
rename to src/UI/MACOSX/ICONROMO.icns
diff --git a/src/OSGLUOSX.c b/src/UI/MACOSX/OSGLUOSX.c
similarity index 99%
rename from src/OSGLUOSX.c
rename to src/UI/MACOSX/OSGLUOSX.c
index d30b400..8af10b2 100644
--- a/src/OSGLUOSX.c
+++ b/src/UI/MACOSX/OSGLUOSX.c
@@ -31,7 +31,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 /* --- adapting to API/ABI version differences --- */
 
diff --git a/src/MYOSGLUE.h b/src/UI/MYOSGLUE.h
similarity index 100%
rename from src/MYOSGLUE.h
rename to src/UI/MYOSGLUE.h
diff --git a/src/ICONAPPM.r b/src/UI/OLDMAC/ICONAPPM.r
similarity index 100%
rename from src/ICONAPPM.r
rename to src/UI/OLDMAC/ICONAPPM.r
diff --git a/src/ICONDSKM.r b/src/UI/OLDMAC/ICONDSKM.r
similarity index 100%
rename from src/ICONDSKM.r
rename to src/UI/OLDMAC/ICONDSKM.r
diff --git a/src/ICONROMM.r b/src/UI/OLDMAC/ICONROMM.r
similarity index 100%
rename from src/ICONROMM.r
rename to src/UI/OLDMAC/ICONROMM.r
diff --git a/src/OSGLUMAC.c b/src/UI/OLDMAC/OSGLUMAC.c
similarity index 99%
rename from src/OSGLUMAC.c
rename to src/UI/OLDMAC/OSGLUMAC.c
index 2e657e1..65539cc 100644
--- a/src/OSGLUMAC.c
+++ b/src/UI/OLDMAC/OSGLUMAC.c
@@ -36,7 +36,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/main.r b/src/UI/OLDMAC/main.r
similarity index 100%
rename from src/main.r
rename to src/UI/OLDMAC/main.r
diff --git a/src/OSGLUCCO.m b/src/UI/OSGLUCCO.m
similarity index 99%
rename from src/OSGLUCCO.m
rename to src/UI/OSGLUCCO.m
index fcc4ea6..600cee3 100644
--- a/src/OSGLUCCO.m
+++ b/src/UI/OSGLUCCO.m
@@ -28,7 +28,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/OSGLUNDS.c b/src/UI/OSGLUNDS.c
similarity index 99%
rename from src/OSGLUNDS.c
rename to src/UI/OSGLUNDS.c
index f0e49f3..e364d58 100644
--- a/src/OSGLUNDS.c
+++ b/src/UI/OSGLUNDS.c
@@ -22,7 +22,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/OSGLUXWN.c b/src/UI/UNIX/OSGLUXWN.c
similarity index 99%
rename from src/OSGLUXWN.c
rename to src/UI/UNIX/OSGLUXWN.c
index 64455f5..d29c5ae 100644
--- a/src/OSGLUXWN.c
+++ b/src/UI/UNIX/OSGLUXWN.c
@@ -39,7 +39,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/ICONAPPW.ico b/src/UI/WIN32/ICONAPPW.ico
similarity index 100%
rename from src/ICONAPPW.ico
rename to src/UI/WIN32/ICONAPPW.ico
diff --git a/src/ICONDSKW.ico b/src/UI/WIN32/ICONDSKW.ico
similarity index 100%
rename from src/ICONDSKW.ico
rename to src/UI/WIN32/ICONDSKW.ico
diff --git a/src/ICONROMW.ico b/src/UI/WIN32/ICONROMW.ico
similarity index 100%
rename from src/ICONROMW.ico
rename to src/UI/WIN32/ICONROMW.ico
diff --git a/src/OSGLUWIN.c b/src/UI/WIN32/OSGLUWIN.c
similarity index 99%
rename from src/OSGLUWIN.c
rename to src/UI/WIN32/OSGLUWIN.c
index cc39918..e10f4dd 100644
--- a/src/OSGLUWIN.c
+++ b/src/UI/WIN32/OSGLUWIN.c
@@ -32,7 +32,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 
 /* --- adapting to API/ABI version differences --- */
diff --git a/src/UI/WIN32/main.rc b/src/UI/WIN32/main.rc
new file mode 100644
index 0000000..40fe227
--- /dev/null
+++ b/src/UI/WIN32/main.rc
@@ -0,0 +1 @@
+256                     ICON    DISCARDABLE     "src/UI/WIN32/ICONAPPW.ico"
diff --git a/src/OSGLUGTK.c b/src/UI/XPLAT/OSGLUGTK.c
similarity index 99%
rename from src/OSGLUGTK.c
rename to src/UI/XPLAT/OSGLUGTK.c
index 52f831b..b483663 100644
--- a/src/OSGLUGTK.c
+++ b/src/UI/XPLAT/OSGLUGTK.c
@@ -25,7 +25,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/OSGLUSD2.c b/src/UI/XPLAT/OSGLUSD2.c
similarity index 99%
rename from src/OSGLUSD2.c
rename to src/UI/XPLAT/OSGLUSD2.c
index 0f28b20..3fdeb81 100644
--- a/src/OSGLUSD2.c
+++ b/src/UI/XPLAT/OSGLUSD2.c
@@ -25,7 +25,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/OSGLUSDL.c b/src/UI/XPLAT/OSGLUSDL.c
similarity index 99%
rename from src/OSGLUSDL.c
rename to src/UI/XPLAT/OSGLUSDL.c
index dd912f8..04f42b8 100644
--- a/src/OSGLUSDL.c
+++ b/src/UI/XPLAT/OSGLUSDL.c
@@ -25,7 +25,7 @@
 #include "SYSDEPNS.h"
 #include "ENDIANAC.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 
 #include "STRCONST.h"
 
diff --git a/src/VIA2EMDV.c b/src/VIA2EMDV.c
index 3927c17..cdffba7 100644
--- a/src/VIA2EMDV.c
+++ b/src/VIA2EMDV.c
@@ -25,7 +25,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
diff --git a/src/VIAEMDEV.c b/src/VIAEMDEV.c
index 3688fe2..95ad75a 100644
--- a/src/VIAEMDEV.c
+++ b/src/VIAEMDEV.c
@@ -25,7 +25,7 @@
 #ifndef AllFiles
 #include "SYSDEPNS.h"
 
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"
 #endif
diff --git a/src/VIDEMDEV.c b/src/VIDEMDEV.c
index 52a5d86..d1b8687 100644
--- a/src/VIDEMDEV.c
+++ b/src/VIDEMDEV.c
@@ -29,7 +29,7 @@
 
 #ifndef AllFiles
 #include "SYSDEPNS.h"
-#include "MYOSGLUE.h"
+#include "UI/MYOSGLUE.h"
 #include "ENDIANAC.h"
 #include "EMCONFIG.h"
 #include "GLOBGLUE.h"