diff --git a/zOLD_darwin/stddialogs.m b/_wip/dialogs/darwin_stddialogs.m
similarity index 100%
rename from zOLD_darwin/stddialogs.m
rename to _wip/dialogs/darwin_stddialogs.m
diff --git a/_wip/dialogs/ui.h b/_wip/dialogs/ui.h
new file mode 100644
index 00000000..71525e41
--- /dev/null
+++ b/_wip/dialogs/ui.h
@@ -0,0 +1,4 @@
+uiprivExtern char *uiOpenFile(uiWindow *parent);
+uiprivExtern char *uiSaveFile(uiWindow *parent);
+uiprivExtern void uiMsgBox(uiWindow *parent, const char *title, const char *description);
+uiprivExtern void uiMsgBoxError(uiWindow *parent, const char *title, const char *description);
diff --git a/zOLD_unix/stddialogs.c b/_wip/dialogs/unix_stddialogs.c
similarity index 100%
rename from zOLD_unix/stddialogs.c
rename to _wip/dialogs/unix_stddialogs.c
diff --git a/zOLD_windows/stddialogs.cpp b/_wip/dialogs/windows_stddialogs.cpp
similarity index 100%
rename from zOLD_windows/stddialogs.cpp
rename to _wip/dialogs/windows_stddialogs.cpp
diff --git a/zOLD_darwin/menu.m b/_wip/menus/darwin_menu.m
similarity index 100%
rename from zOLD_darwin/menu.m
rename to _wip/menus/darwin_menu.m
diff --git a/_wip/menus/ui.h b/_wip/menus/ui.h
new file mode 100644
index 00000000..af81196b
--- /dev/null
+++ b/_wip/menus/ui.h
@@ -0,0 +1,17 @@
+typedef struct uiMenuItem uiMenuItem;
+#define uiMenuItem(this) ((uiMenuItem *) (this))
+uiprivExtern void uiMenuItemEnable(uiMenuItem *m);
+uiprivExtern void uiMenuItemDisable(uiMenuItem *m);
+uiprivExtern void uiMenuItemOnClicked(uiMenuItem *m, void (*f)(uiMenuItem *sender, uiWindow *window, void *data), void *data);
+uiprivExtern int uiMenuItemChecked(uiMenuItem *m);
+uiprivExtern void uiMenuItemSetChecked(uiMenuItem *m, int checked);
+
+typedef struct uiMenu uiMenu;
+#define uiMenu(this) ((uiMenu *) (this))
+uiprivExtern uiMenuItem *uiMenuAppendItem(uiMenu *m, const char *name);
+uiprivExtern uiMenuItem *uiMenuAppendCheckItem(uiMenu *m, const char *name);
+uiprivExtern uiMenuItem *uiMenuAppendQuitItem(uiMenu *m);
+uiprivExtern uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m);
+uiprivExtern uiMenuItem *uiMenuAppendAboutItem(uiMenu *m);
+uiprivExtern void uiMenuAppendSeparator(uiMenu *m);
+uiprivExtern uiMenu *uiNewMenu(const char *name);
diff --git a/zOLD_unix/menu.c b/_wip/menus/unix_menu.c
similarity index 100%
rename from zOLD_unix/menu.c
rename to _wip/menus/unix_menu.c
diff --git a/zOLD_windows/menu.cpp b/_wip/menus/windows_menu.cpp
similarity index 100%
rename from zOLD_windows/menu.cpp
rename to _wip/menus/windows_menu.cpp
diff --git a/examples/controlgallery/darwin.png b/zOLD_examples/controlgallery/darwin.png
similarity index 100%
rename from examples/controlgallery/darwin.png
rename to zOLD_examples/controlgallery/darwin.png
diff --git a/examples/controlgallery/main.c b/zOLD_examples/controlgallery/main.c
similarity index 100%
rename from examples/controlgallery/main.c
rename to zOLD_examples/controlgallery/main.c
diff --git a/examples/controlgallery/unix.png b/zOLD_examples/controlgallery/unix.png
similarity index 100%
rename from examples/controlgallery/unix.png
rename to zOLD_examples/controlgallery/unix.png
diff --git a/examples/controlgallery/windows.png b/zOLD_examples/controlgallery/windows.png
similarity index 100%
rename from examples/controlgallery/windows.png
rename to zOLD_examples/controlgallery/windows.png
diff --git a/examples/cpp-multithread/main.cpp b/zOLD_examples/cpp-multithread/main.cpp
similarity index 100%
rename from examples/cpp-multithread/main.cpp
rename to zOLD_examples/cpp-multithread/main.cpp
diff --git a/examples/datetime/main.c b/zOLD_examples/datetime/main.c
similarity index 100%
rename from examples/datetime/main.c
rename to zOLD_examples/datetime/main.c
diff --git a/examples/drawtext/main.c b/zOLD_examples/drawtext/main.c
similarity index 100%
rename from examples/drawtext/main.c
rename to zOLD_examples/drawtext/main.c
diff --git a/examples/example.manifest b/zOLD_examples/example.manifest
similarity index 100%
rename from examples/example.manifest
rename to zOLD_examples/example.manifest
diff --git a/examples/example.static.manifest b/zOLD_examples/example.static.manifest
similarity index 100%
rename from examples/example.static.manifest
rename to zOLD_examples/example.static.manifest
diff --git a/examples/histogram/main.c b/zOLD_examples/histogram/main.c
similarity index 100%
rename from examples/histogram/main.c
rename to zOLD_examples/histogram/main.c
diff --git a/examples/meson.build b/zOLD_examples/meson.build
similarity index 100%
rename from examples/meson.build
rename to zOLD_examples/meson.build
diff --git a/examples/resources.rc b/zOLD_examples/resources.rc
similarity index 100%
rename from examples/resources.rc
rename to zOLD_examples/resources.rc
diff --git a/examples/timer/main.c b/zOLD_examples/timer/main.c
similarity index 100%
rename from examples/timer/main.c
rename to zOLD_examples/timer/main.c
diff --git a/zOLD_ui.h b/zOLD_ui.h
index e045bae5..858c0553 100644
--- a/zOLD_ui.h
+++ b/zOLD_ui.h
@@ -246,29 +246,6 @@ uiprivExtern void uiMultilineEntrySetReadOnly(uiMultilineEntry *e, int readonly)
 uiprivExtern uiMultilineEntry *uiNewMultilineEntry(void);
 uiprivExtern uiMultilineEntry *uiNewNonWrappingMultilineEntry(void);
 
-typedef struct uiMenuItem uiMenuItem;
-#define uiMenuItem(this) ((uiMenuItem *) (this))
-uiprivExtern void uiMenuItemEnable(uiMenuItem *m);
-uiprivExtern void uiMenuItemDisable(uiMenuItem *m);
-uiprivExtern void uiMenuItemOnClicked(uiMenuItem *m, void (*f)(uiMenuItem *sender, uiWindow *window, void *data), void *data);
-uiprivExtern int uiMenuItemChecked(uiMenuItem *m);
-uiprivExtern void uiMenuItemSetChecked(uiMenuItem *m, int checked);
-
-typedef struct uiMenu uiMenu;
-#define uiMenu(this) ((uiMenu *) (this))
-uiprivExtern uiMenuItem *uiMenuAppendItem(uiMenu *m, const char *name);
-uiprivExtern uiMenuItem *uiMenuAppendCheckItem(uiMenu *m, const char *name);
-uiprivExtern uiMenuItem *uiMenuAppendQuitItem(uiMenu *m);
-uiprivExtern uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m);
-uiprivExtern uiMenuItem *uiMenuAppendAboutItem(uiMenu *m);
-uiprivExtern void uiMenuAppendSeparator(uiMenu *m);
-uiprivExtern uiMenu *uiNewMenu(const char *name);
-
-uiprivExtern char *uiOpenFile(uiWindow *parent);
-uiprivExtern char *uiSaveFile(uiWindow *parent);
-uiprivExtern void uiMsgBox(uiWindow *parent, const char *title, const char *description);
-uiprivExtern void uiMsgBoxError(uiWindow *parent, const char *title, const char *description);
-
 typedef struct uiArea uiArea;
 typedef struct uiAreaHandler uiAreaHandler;
 typedef struct uiAreaDrawParams uiAreaDrawParams;