diff --git a/new/alloc_darwin.m b/new/darwin/alloc.m
similarity index 100%
rename from new/alloc_darwin.m
rename to new/darwin/alloc.m
diff --git a/new/button_darwin.m b/new/darwin/button.m
similarity index 100%
rename from new/button_darwin.m
rename to new/darwin/button.m
diff --git a/new/checkbox_darwin.m b/new/darwin/checkbox.m
similarity index 100%
rename from new/checkbox_darwin.m
rename to new/darwin/checkbox.m
diff --git a/new/entry_darwin.m b/new/darwin/entry.m
similarity index 100%
rename from new/entry_darwin.m
rename to new/darwin/entry.m
diff --git a/new/init_darwin.m b/new/darwin/init.m
similarity index 100%
rename from new/init_darwin.m
rename to new/darwin/init.m
diff --git a/new/label_darwin.m b/new/darwin/label.m
similarity index 100%
rename from new/label_darwin.m
rename to new/darwin/label.m
diff --git a/new/main_darwin.m b/new/darwin/main.m
similarity index 100%
rename from new/main_darwin.m
rename to new/darwin/main.m
diff --git a/new/newcontrol_darwin.m b/new/darwin/newcontrol.m
similarity index 100%
rename from new/newcontrol_darwin.m
rename to new/darwin/newcontrol.m
diff --git a/new/parent_darwin.m b/new/darwin/parent.m
similarity index 100%
rename from new/parent_darwin.m
rename to new/darwin/parent.m
diff --git a/new/tab_darwin.m b/new/darwin/tab.m
similarity index 100%
rename from new/tab_darwin.m
rename to new/darwin/tab.m
diff --git a/new/text_darwin.m b/new/darwin/text.m
similarity index 100%
rename from new/text_darwin.m
rename to new/darwin/text.m
diff --git a/new/util_darwin.m b/new/darwin/util.m
similarity index 100%
rename from new/util_darwin.m
rename to new/darwin/util.m
diff --git a/new/window_darwin.m b/new/darwin/window.m
similarity index 100%
rename from new/window_darwin.m
rename to new/darwin/window.m
diff --git a/new/alloc_unix.c b/new/unix/alloc.c
similarity index 100%
rename from new/alloc_unix.c
rename to new/unix/alloc.c
diff --git a/new/button_unix.c b/new/unix/button.c
similarity index 100%
rename from new/button_unix.c
rename to new/unix/button.c
diff --git a/new/checkbox_unix.c b/new/unix/checkbox.c
similarity index 100%
rename from new/checkbox_unix.c
rename to new/unix/checkbox.c
diff --git a/new/entry_unix.c b/new/unix/entry.c
similarity index 100%
rename from new/entry_unix.c
rename to new/unix/entry.c
diff --git a/new/init_unix.c b/new/unix/init.c
similarity index 100%
rename from new/init_unix.c
rename to new/unix/init.c
diff --git a/new/label_unix.c b/new/unix/label.c
similarity index 100%
rename from new/label_unix.c
rename to new/unix/label.c
diff --git a/new/main_unix.c b/new/unix/main.c
similarity index 100%
rename from new/main_unix.c
rename to new/unix/main.c
diff --git a/new/newcontrol_unix.c b/new/unix/newcontrol.c
similarity index 100%
rename from new/newcontrol_unix.c
rename to new/unix/newcontrol.c
diff --git a/new/parent_unix.c b/new/unix/parent.c
similarity index 100%
rename from new/parent_unix.c
rename to new/unix/parent.c
diff --git a/new/tab_unix.c b/new/unix/tab.c
similarity index 100%
rename from new/tab_unix.c
rename to new/unix/tab.c
diff --git a/new/util_unix.c b/new/unix/util.c
similarity index 100%
rename from new/util_unix.c
rename to new/unix/util.c
diff --git a/new/window_unix.c b/new/unix/window.c
similarity index 100%
rename from new/window_unix.c
rename to new/unix/window.c
diff --git a/new/alloc_windows.c b/new/windows/alloc.c
similarity index 100%
rename from new/alloc_windows.c
rename to new/windows/alloc.c
diff --git a/new/button_windows.c b/new/windows/button.c
similarity index 100%
rename from new/button_windows.c
rename to new/windows/button.c
diff --git a/new/checkbox_windows.c b/new/windows/checkbox.c
similarity index 100%
rename from new/checkbox_windows.c
rename to new/windows/checkbox.c
diff --git a/new/comctl32_windows.c b/new/windows/comctl32.c
similarity index 100%
rename from new/comctl32_windows.c
rename to new/windows/comctl32.c
diff --git a/new/debug_windows.c b/new/windows/debug.c
similarity index 100%
rename from new/debug_windows.c
rename to new/windows/debug.c
diff --git a/new/entry_windows.c b/new/windows/entry.c
similarity index 100%
rename from new/entry_windows.c
rename to new/windows/entry.c
diff --git a/new/init_windows.c b/new/windows/init.c
similarity index 100%
rename from new/init_windows.c
rename to new/windows/init.c
diff --git a/new/label_windows.c b/new/windows/label.c
similarity index 100%
rename from new/label_windows.c
rename to new/windows/label.c
diff --git a/new/main_windows.c b/new/windows/main.c
similarity index 100%
rename from new/main_windows.c
rename to new/windows/main.c
diff --git a/new/newcontrol_windows.c b/new/windows/newcontrol.c
similarity index 100%
rename from new/newcontrol_windows.c
rename to new/windows/newcontrol.c
diff --git a/new/parent_windows.c b/new/windows/parent.c
similarity index 100%
rename from new/parent_windows.c
rename to new/windows/parent.c
diff --git a/new/tab_windows.c b/new/windows/tab.c
similarity index 100%
rename from new/tab_windows.c
rename to new/windows/tab.c
diff --git a/new/text_windows.c b/new/windows/text.c
similarity index 100%
rename from new/text_windows.c
rename to new/windows/text.c
diff --git a/new/util_windows.c b/new/windows/util.c
similarity index 100%
rename from new/util_windows.c
rename to new/windows/util.c
diff --git a/new/window_windows.c b/new/windows/window.c
similarity index 100%
rename from new/window_windows.c
rename to new/windows/window.c