diff --git a/new/GNUbase.mk b/GNUbase.mk
similarity index 100%
rename from new/GNUbase.mk
rename to GNUbase.mk
diff --git a/new/GNUmakefile b/GNUmakefile
similarity index 100%
rename from new/GNUmakefile
rename to GNUmakefile
diff --git a/new/GNUmaketest.mk b/GNUmaketest.mk
similarity index 100%
rename from new/GNUmaketest.mk
rename to GNUmaketest.mk
diff --git a/new/box.c b/box.c
similarity index 100%
rename from new/box.c
rename to box.c
diff --git a/new/darwin/GNUmakeinc.mk b/darwin/GNUmakeinc.mk
similarity index 100%
rename from new/darwin/GNUmakeinc.mk
rename to darwin/GNUmakeinc.mk
diff --git a/new/darwin/alloc.m b/darwin/alloc.m
similarity index 100%
rename from new/darwin/alloc.m
rename to darwin/alloc.m
diff --git a/new/darwin/bin.m b/darwin/bin.m
similarity index 100%
rename from new/darwin/bin.m
rename to darwin/bin.m
diff --git a/new/darwin/button.m b/darwin/button.m
similarity index 100%
rename from new/darwin/button.m
rename to darwin/button.m
diff --git a/new/darwin/checkbox.m b/darwin/checkbox.m
similarity index 100%
rename from new/darwin/checkbox.m
rename to darwin/checkbox.m
diff --git a/new/darwin/container.m b/darwin/container.m
similarity index 100%
rename from new/darwin/container.m
rename to darwin/container.m
diff --git a/new/darwin/entry.m b/darwin/entry.m
similarity index 100%
rename from new/darwin/entry.m
rename to darwin/entry.m
diff --git a/new/darwin/init.m b/darwin/init.m
similarity index 100%
rename from new/darwin/init.m
rename to darwin/init.m
diff --git a/new/darwin/label.m b/darwin/label.m
similarity index 100%
rename from new/darwin/label.m
rename to darwin/label.m
diff --git a/new/darwin/main.m b/darwin/main.m
similarity index 100%
rename from new/darwin/main.m
rename to darwin/main.m
diff --git a/new/darwin/menu.m b/darwin/menu.m
similarity index 100%
rename from new/darwin/menu.m
rename to darwin/menu.m
diff --git a/new/darwin/newcontrol.m b/darwin/newcontrol.m
similarity index 100%
rename from new/darwin/newcontrol.m
rename to darwin/newcontrol.m
diff --git a/new/darwin/tab.m b/darwin/tab.m
similarity index 100%
rename from new/darwin/tab.m
rename to darwin/tab.m
diff --git a/new/darwin/text.m b/darwin/text.m
similarity index 100%
rename from new/darwin/text.m
rename to darwin/text.m
diff --git a/new/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h
similarity index 100%
rename from new/darwin/uipriv_darwin.h
rename to darwin/uipriv_darwin.h
diff --git a/new/darwin/util.m b/darwin/util.m
similarity index 100%
rename from new/darwin/util.m
rename to darwin/util.m
diff --git a/new/darwin/window.m b/darwin/window.m
similarity index 100%
rename from new/darwin/window.m
rename to darwin/window.m
diff --git a/new/test/GNUmakeinc.mk b/test/GNUmakeinc.mk
similarity index 100%
rename from new/test/GNUmakeinc.mk
rename to test/GNUmakeinc.mk
diff --git a/new/test/main.c b/test/main.c
similarity index 100%
rename from new/test/main.c
rename to test/main.c
diff --git a/new/test/menus.c b/test/menus.c
similarity index 100%
rename from new/test/menus.c
rename to test/menus.c
diff --git a/new/test/spaced.c b/test/spaced.c
similarity index 100%
rename from new/test/spaced.c
rename to test/spaced.c
diff --git a/new/test/test.h b/test/test.h
similarity index 100%
rename from new/test/test.h
rename to test/test.h
diff --git a/new/ui.idl b/ui.idl
similarity index 100%
rename from new/ui.idl
rename to ui.idl
diff --git a/new/ui_darwin.h b/ui_darwin.h
similarity index 100%
rename from new/ui_darwin.h
rename to ui_darwin.h
diff --git a/new/ui_unix.h b/ui_unix.h
similarity index 100%
rename from new/ui_unix.h
rename to ui_unix.h
diff --git a/new/ui_windows.h b/ui_windows.h
similarity index 100%
rename from new/ui_windows.h
rename to ui_windows.h
diff --git a/new/uipriv.h b/uipriv.h
similarity index 100%
rename from new/uipriv.h
rename to uipriv.h
diff --git a/new/unix/GNUmakeinc.mk b/unix/GNUmakeinc.mk
similarity index 100%
rename from new/unix/GNUmakeinc.mk
rename to unix/GNUmakeinc.mk
diff --git a/new/unix/alloc.c b/unix/alloc.c
similarity index 100%
rename from new/unix/alloc.c
rename to unix/alloc.c
diff --git a/new/unix/bin.c b/unix/bin.c
similarity index 100%
rename from new/unix/bin.c
rename to unix/bin.c
diff --git a/new/unix/button.c b/unix/button.c
similarity index 100%
rename from new/unix/button.c
rename to unix/button.c
diff --git a/new/unix/checkbox.c b/unix/checkbox.c
similarity index 100%
rename from new/unix/checkbox.c
rename to unix/checkbox.c
diff --git a/new/unix/container.c b/unix/container.c
similarity index 100%
rename from new/unix/container.c
rename to unix/container.c
diff --git a/new/unix/entry.c b/unix/entry.c
similarity index 100%
rename from new/unix/entry.c
rename to unix/entry.c
diff --git a/new/unix/label.c b/unix/label.c
similarity index 100%
rename from new/unix/label.c
rename to unix/label.c
diff --git a/new/unix/main.c b/unix/main.c
similarity index 100%
rename from new/unix/main.c
rename to unix/main.c
diff --git a/new/unix/menu.c b/unix/menu.c
similarity index 100%
rename from new/unix/menu.c
rename to unix/menu.c
diff --git a/new/unix/newcontrol.c b/unix/newcontrol.c
similarity index 100%
rename from new/unix/newcontrol.c
rename to unix/newcontrol.c
diff --git a/new/unix/tab.c b/unix/tab.c
similarity index 100%
rename from new/unix/tab.c
rename to unix/tab.c
diff --git a/new/unix/text.c b/unix/text.c
similarity index 100%
rename from new/unix/text.c
rename to unix/text.c
diff --git a/new/unix/uipriv_unix.h b/unix/uipriv_unix.h
similarity index 100%
rename from new/unix/uipriv_unix.h
rename to unix/uipriv_unix.h
diff --git a/new/unix/util.c b/unix/util.c
similarity index 100%
rename from new/unix/util.c
rename to unix/util.c
diff --git a/new/unix/window.c b/unix/window.c
similarity index 100%
rename from new/unix/window.c
rename to unix/window.c
diff --git a/new/windows/GNUmakeinc.mk b/windows/GNUmakeinc.mk
similarity index 100%
rename from new/windows/GNUmakeinc.mk
rename to windows/GNUmakeinc.mk
diff --git a/new/windows/OLDcontainer.c b/windows/OLDcontainer.c
similarity index 100%
rename from new/windows/OLDcontainer.c
rename to windows/OLDcontainer.c
diff --git a/new/windows/alloc.c b/windows/alloc.c
similarity index 100%
rename from new/windows/alloc.c
rename to windows/alloc.c
diff --git a/new/windows/bin.c b/windows/bin.c
similarity index 100%
rename from new/windows/bin.c
rename to windows/bin.c
diff --git a/new/windows/button.c b/windows/button.c
similarity index 100%
rename from new/windows/button.c
rename to windows/button.c
diff --git a/new/windows/checkbox.c b/windows/checkbox.c
similarity index 100%
rename from new/windows/checkbox.c
rename to windows/checkbox.c
diff --git a/new/windows/comctl32.c b/windows/comctl32.c
similarity index 100%
rename from new/windows/comctl32.c
rename to windows/comctl32.c
diff --git a/new/windows/container.c b/windows/container.c
similarity index 100%
rename from new/windows/container.c
rename to windows/container.c
diff --git a/new/windows/debug.c b/windows/debug.c
similarity index 100%
rename from new/windows/debug.c
rename to windows/debug.c
diff --git a/new/windows/entry.c b/windows/entry.c
similarity index 100%
rename from new/windows/entry.c
rename to windows/entry.c
diff --git a/new/windows/init.c b/windows/init.c
similarity index 100%
rename from new/windows/init.c
rename to windows/init.c
diff --git a/new/windows/label.c b/windows/label.c
similarity index 100%
rename from new/windows/label.c
rename to windows/label.c
diff --git a/new/windows/main.c b/windows/main.c
similarity index 100%
rename from new/windows/main.c
rename to windows/main.c
diff --git a/new/windows/menu.c b/windows/menu.c
similarity index 100%
rename from new/windows/menu.c
rename to windows/menu.c
diff --git a/new/windows/newcontrol.c b/windows/newcontrol.c
similarity index 100%
rename from new/windows/newcontrol.c
rename to windows/newcontrol.c
diff --git a/new/windows/tab.c b/windows/tab.c
similarity index 100%
rename from new/windows/tab.c
rename to windows/tab.c
diff --git a/new/windows/text.c b/windows/text.c
similarity index 100%
rename from new/windows/text.c
rename to windows/text.c
diff --git a/new/windows/uipriv_windows.h b/windows/uipriv_windows.h
similarity index 100%
rename from new/windows/uipriv_windows.h
rename to windows/uipriv_windows.h
diff --git a/new/windows/util.c b/windows/util.c
similarity index 100%
rename from new/windows/util.c
rename to windows/util.c
diff --git a/new/windows/window.c b/windows/window.c
similarity index 100%
rename from new/windows/window.c
rename to windows/window.c