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