diff --git a/redo/GNUbase.mk b/GNUbase.mk
similarity index 100%
rename from redo/GNUbase.mk
rename to GNUbase.mk
diff --git a/redo/GNUmakefile b/GNUmakefile
similarity index 100%
rename from redo/GNUmakefile
rename to GNUmakefile
diff --git a/redo/GNUmaketest.mk b/GNUmaketest.mk
similarity index 100%
rename from redo/GNUmaketest.mk
rename to GNUmaketest.mk
diff --git a/redo/control.c b/control.c
similarity index 100%
rename from redo/control.c
rename to control.c
diff --git a/redo/darwin/GNUmakeinc.mk b/darwin/GNUmakeinc.mk
similarity index 100%
rename from redo/darwin/GNUmakeinc.mk
rename to darwin/GNUmakeinc.mk
diff --git a/redo/darwin/alloc.m b/darwin/alloc.m
similarity index 100%
rename from redo/darwin/alloc.m
rename to darwin/alloc.m
diff --git a/redo/darwin/autolayout.m b/darwin/autolayout.m
similarity index 100%
rename from redo/darwin/autolayout.m
rename to darwin/autolayout.m
diff --git a/redo/darwin/box.m b/darwin/box.m
similarity index 100%
rename from redo/darwin/box.m
rename to darwin/box.m
diff --git a/redo/darwin/button.m b/darwin/button.m
similarity index 100%
rename from redo/darwin/button.m
rename to darwin/button.m
diff --git a/redo/darwin/checkbox.m b/darwin/checkbox.m
similarity index 100%
rename from redo/darwin/checkbox.m
rename to darwin/checkbox.m
diff --git a/redo/darwin/combobox.m b/darwin/combobox.m
similarity index 100%
rename from redo/darwin/combobox.m
rename to darwin/combobox.m
diff --git a/redo/darwin/control.m b/darwin/control.m
similarity index 100%
rename from redo/darwin/control.m
rename to darwin/control.m
diff --git a/redo/darwin/datetimepicker.m b/darwin/datetimepicker.m
similarity index 100%
rename from redo/darwin/datetimepicker.m
rename to darwin/datetimepicker.m
diff --git a/redo/darwin/entry.m b/darwin/entry.m
similarity index 100%
rename from redo/darwin/entry.m
rename to darwin/entry.m
diff --git a/redo/darwin/group.m b/darwin/group.m
similarity index 100%
rename from redo/darwin/group.m
rename to darwin/group.m
diff --git a/redo/darwin/label.m b/darwin/label.m
similarity index 100%
rename from redo/darwin/label.m
rename to darwin/label.m
diff --git a/redo/darwin/main.m b/darwin/main.m
similarity index 100%
rename from redo/darwin/main.m
rename to darwin/main.m
diff --git a/redo/darwin/map.m b/darwin/map.m
similarity index 100%
rename from redo/darwin/map.m
rename to darwin/map.m
diff --git a/redo/darwin/menu.m b/darwin/menu.m
similarity index 100%
rename from redo/darwin/menu.m
rename to darwin/menu.m
diff --git a/redo/darwin/progressbar.m b/darwin/progressbar.m
similarity index 100%
rename from redo/darwin/progressbar.m
rename to darwin/progressbar.m
diff --git a/redo/darwin/radiobuttons.m b/darwin/radiobuttons.m
similarity index 100%
rename from redo/darwin/radiobuttons.m
rename to darwin/radiobuttons.m
diff --git a/redo/darwin/separator.m b/darwin/separator.m
similarity index 100%
rename from redo/darwin/separator.m
rename to darwin/separator.m
diff --git a/redo/darwin/slider.m b/darwin/slider.m
similarity index 100%
rename from redo/darwin/slider.m
rename to darwin/slider.m
diff --git a/redo/darwin/spinbox.m b/darwin/spinbox.m
similarity index 100%
rename from redo/darwin/spinbox.m
rename to darwin/spinbox.m
diff --git a/redo/darwin/stddialogs.m b/darwin/stddialogs.m
similarity index 100%
rename from redo/darwin/stddialogs.m
rename to darwin/stddialogs.m
diff --git a/redo/darwin/tab.m b/darwin/tab.m
similarity index 100%
rename from redo/darwin/tab.m
rename to darwin/tab.m
diff --git a/redo/darwin/text.m b/darwin/text.m
similarity index 100%
rename from redo/darwin/text.m
rename to darwin/text.m
diff --git a/redo/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h
similarity index 100%
rename from redo/darwin/uipriv_darwin.h
rename to darwin/uipriv_darwin.h
diff --git a/redo/darwin/util.m b/darwin/util.m
similarity index 100%
rename from redo/darwin/util.m
rename to darwin/util.m
diff --git a/redo/darwin/window.m b/darwin/window.m
similarity index 100%
rename from redo/darwin/window.m
rename to darwin/window.m
diff --git a/redo/menu.c b/menu.c
similarity index 100%
rename from redo/menu.c
rename to menu.c
diff --git a/redo/ptrarray.c b/ptrarray.c
similarity index 100%
rename from redo/ptrarray.c
rename to ptrarray.c
diff --git a/redo/shouldquit.c b/shouldquit.c
similarity index 100%
rename from redo/shouldquit.c
rename to shouldquit.c
diff --git a/redo/test/GNUmakeinc.mk b/test/GNUmakeinc.mk
similarity index 100%
rename from redo/test/GNUmakeinc.mk
rename to test/GNUmakeinc.mk
diff --git a/redo/test/main.c b/test/main.c
similarity index 100%
rename from redo/test/main.c
rename to test/main.c
diff --git a/redo/test/menus.c b/test/menus.c
similarity index 100%
rename from redo/test/menus.c
rename to test/menus.c
diff --git a/redo/test/page1.c b/test/page1.c
similarity index 100%
rename from redo/test/page1.c
rename to test/page1.c
diff --git a/redo/test/page2.c b/test/page2.c
similarity index 100%
rename from redo/test/page2.c
rename to test/page2.c
diff --git a/redo/test/page3.c b/test/page3.c
similarity index 100%
rename from redo/test/page3.c
rename to test/page3.c
diff --git a/redo/test/page4.c b/test/page4.c
similarity index 100%
rename from redo/test/page4.c
rename to test/page4.c
diff --git a/redo/test/page5.c b/test/page5.c
similarity index 100%
rename from redo/test/page5.c
rename to test/page5.c
diff --git a/redo/test/spaced.c b/test/spaced.c
similarity index 100%
rename from redo/test/spaced.c
rename to test/spaced.c
diff --git a/redo/test/test.h b/test/test.h
similarity index 100%
rename from redo/test/test.h
rename to test/test.h
diff --git a/redo/types.c b/types.c
similarity index 100%
rename from redo/types.c
rename to types.c
diff --git a/redo/ui.h b/ui.h
similarity index 100%
rename from redo/ui.h
rename to ui.h
diff --git a/redo/ui_darwin.h b/ui_darwin.h
similarity index 100%
rename from redo/ui_darwin.h
rename to ui_darwin.h
diff --git a/redo/ui_unix.h b/ui_unix.h
similarity index 100%
rename from redo/ui_unix.h
rename to ui_unix.h
diff --git a/redo/ui_windows.h b/ui_windows.h
similarity index 100%
rename from redo/ui_windows.h
rename to ui_windows.h
diff --git a/redo/uipriv.h b/uipriv.h
similarity index 100%
rename from redo/uipriv.h
rename to uipriv.h
diff --git a/redo/unix/GNUmakeinc.mk b/unix/GNUmakeinc.mk
similarity index 100%
rename from redo/unix/GNUmakeinc.mk
rename to unix/GNUmakeinc.mk
diff --git a/redo/unix/alloc.c b/unix/alloc.c
similarity index 100%
rename from redo/unix/alloc.c
rename to unix/alloc.c
diff --git a/redo/unix/box.c b/unix/box.c
similarity index 100%
rename from redo/unix/box.c
rename to unix/box.c
diff --git a/redo/unix/button.c b/unix/button.c
similarity index 100%
rename from redo/unix/button.c
rename to unix/button.c
diff --git a/redo/unix/checkbox.c b/unix/checkbox.c
similarity index 100%
rename from redo/unix/checkbox.c
rename to unix/checkbox.c
diff --git a/redo/unix/child.c b/unix/child.c
similarity index 100%
rename from redo/unix/child.c
rename to unix/child.c
diff --git a/redo/unix/combobox.c b/unix/combobox.c
similarity index 100%
rename from redo/unix/combobox.c
rename to unix/combobox.c
diff --git a/redo/unix/control.c b/unix/control.c
similarity index 100%
rename from redo/unix/control.c
rename to unix/control.c
diff --git a/redo/unix/datetimepicker.c b/unix/datetimepicker.c
similarity index 100%
rename from redo/unix/datetimepicker.c
rename to unix/datetimepicker.c
diff --git a/redo/unix/entry.c b/unix/entry.c
similarity index 100%
rename from redo/unix/entry.c
rename to unix/entry.c
diff --git a/redo/unix/group.c b/unix/group.c
similarity index 100%
rename from redo/unix/group.c
rename to unix/group.c
diff --git a/redo/unix/label.c b/unix/label.c
similarity index 100%
rename from redo/unix/label.c
rename to unix/label.c
diff --git a/redo/unix/main.c b/unix/main.c
similarity index 100%
rename from redo/unix/main.c
rename to unix/main.c
diff --git a/redo/unix/menu.c b/unix/menu.c
similarity index 100%
rename from redo/unix/menu.c
rename to unix/menu.c
diff --git a/redo/unix/progressbar.c b/unix/progressbar.c
similarity index 100%
rename from redo/unix/progressbar.c
rename to unix/progressbar.c
diff --git a/redo/unix/radiobuttons.c b/unix/radiobuttons.c
similarity index 100%
rename from redo/unix/radiobuttons.c
rename to unix/radiobuttons.c
diff --git a/redo/unix/separator.c b/unix/separator.c
similarity index 100%
rename from redo/unix/separator.c
rename to unix/separator.c
diff --git a/redo/unix/slider.c b/unix/slider.c
similarity index 100%
rename from redo/unix/slider.c
rename to unix/slider.c
diff --git a/redo/unix/spinbox.c b/unix/spinbox.c
similarity index 100%
rename from redo/unix/spinbox.c
rename to unix/spinbox.c
diff --git a/redo/unix/stddialogs.c b/unix/stddialogs.c
similarity index 100%
rename from redo/unix/stddialogs.c
rename to unix/stddialogs.c
diff --git a/redo/unix/tab.c b/unix/tab.c
similarity index 100%
rename from redo/unix/tab.c
rename to unix/tab.c
diff --git a/redo/unix/text.c b/unix/text.c
similarity index 100%
rename from redo/unix/text.c
rename to unix/text.c
diff --git a/redo/unix/uipriv_unix.h b/unix/uipriv_unix.h
similarity index 100%
rename from redo/unix/uipriv_unix.h
rename to unix/uipriv_unix.h
diff --git a/redo/unix/util.c b/unix/util.c
similarity index 100%
rename from redo/unix/util.c
rename to unix/util.c
diff --git a/redo/unix/window.c b/unix/window.c
similarity index 100%
rename from redo/unix/window.c
rename to unix/window.c
diff --git a/redo/uthash/LICENSE b/uthash/LICENSE
similarity index 100%
rename from redo/uthash/LICENSE
rename to uthash/LICENSE
diff --git a/redo/uthash/utarray.h b/uthash/utarray.h
similarity index 100%
rename from redo/uthash/utarray.h
rename to uthash/utarray.h
diff --git a/redo/uthash/uthash.h b/uthash/uthash.h
similarity index 100%
rename from redo/uthash/uthash.h
rename to uthash/uthash.h
diff --git a/redo/uthash/utlist.h b/uthash/utlist.h
similarity index 100%
rename from redo/uthash/utlist.h
rename to uthash/utlist.h
diff --git a/redo/uthash/utstring.h b/uthash/utstring.h
similarity index 100%
rename from redo/uthash/utstring.h
rename to uthash/utstring.h
diff --git a/redo/windows/GNUmakeinc.mk b/windows/GNUmakeinc.mk
similarity index 100%
rename from redo/windows/GNUmakeinc.mk
rename to windows/GNUmakeinc.mk
diff --git a/redo/windows/alloc.c b/windows/alloc.c
similarity index 100%
rename from redo/windows/alloc.c
rename to windows/alloc.c
diff --git a/redo/windows/box.c b/windows/box.c
similarity index 100%
rename from redo/windows/box.c
rename to windows/box.c
diff --git a/redo/windows/button.c b/windows/button.c
similarity index 100%
rename from redo/windows/button.c
rename to windows/button.c
diff --git a/redo/windows/checkbox.c b/windows/checkbox.c
similarity index 100%
rename from redo/windows/checkbox.c
rename to windows/checkbox.c
diff --git a/redo/windows/child.c b/windows/child.c
similarity index 100%
rename from redo/windows/child.c
rename to windows/child.c
diff --git a/redo/windows/combobox.c b/windows/combobox.c
similarity index 100%
rename from redo/windows/combobox.c
rename to windows/combobox.c
diff --git a/redo/windows/compilerver.h b/windows/compilerver.h
similarity index 100%
rename from redo/windows/compilerver.h
rename to windows/compilerver.h
diff --git a/redo/windows/container.c b/windows/container.c
similarity index 100%
rename from redo/windows/container.c
rename to windows/container.c
diff --git a/redo/windows/control.c b/windows/control.c
similarity index 100%
rename from redo/windows/control.c
rename to windows/control.c
diff --git a/redo/windows/datetimepicker.c b/windows/datetimepicker.c
similarity index 100%
rename from redo/windows/datetimepicker.c
rename to windows/datetimepicker.c
diff --git a/redo/windows/debug.c b/windows/debug.c
similarity index 100%
rename from redo/windows/debug.c
rename to windows/debug.c
diff --git a/redo/windows/dialoghelper.c b/windows/dialoghelper.c
similarity index 100%
rename from redo/windows/dialoghelper.c
rename to windows/dialoghelper.c
diff --git a/redo/windows/entry.c b/windows/entry.c
similarity index 100%
rename from redo/windows/entry.c
rename to windows/entry.c
diff --git a/redo/windows/events.c b/windows/events.c
similarity index 100%
rename from redo/windows/events.c
rename to windows/events.c
diff --git a/redo/windows/group.c b/windows/group.c
similarity index 100%
rename from redo/windows/group.c
rename to windows/group.c
diff --git a/redo/windows/init.c b/windows/init.c
similarity index 100%
rename from redo/windows/init.c
rename to windows/init.c
diff --git a/redo/windows/label.c b/windows/label.c
similarity index 100%
rename from redo/windows/label.c
rename to windows/label.c
diff --git a/redo/windows/main.c b/windows/main.c
similarity index 100%
rename from redo/windows/main.c
rename to windows/main.c
diff --git a/redo/windows/menu.c b/windows/menu.c
similarity index 100%
rename from redo/windows/menu.c
rename to windows/menu.c
diff --git a/redo/windows/parent.c b/windows/parent.c
similarity index 100%
rename from redo/windows/parent.c
rename to windows/parent.c
diff --git a/redo/windows/progressbar.c b/windows/progressbar.c
similarity index 100%
rename from redo/windows/progressbar.c
rename to windows/progressbar.c
diff --git a/redo/windows/radiobuttons.c b/windows/radiobuttons.c
similarity index 100%
rename from redo/windows/radiobuttons.c
rename to windows/radiobuttons.c
diff --git a/redo/windows/resize.c b/windows/resize.c
similarity index 100%
rename from redo/windows/resize.c
rename to windows/resize.c
diff --git a/redo/windows/resources.h b/windows/resources.h
similarity index 100%
rename from redo/windows/resources.h
rename to windows/resources.h
diff --git a/redo/windows/resources.rc b/windows/resources.rc
similarity index 100%
rename from redo/windows/resources.rc
rename to windows/resources.rc
diff --git a/redo/windows/separator.c b/windows/separator.c
similarity index 100%
rename from redo/windows/separator.c
rename to windows/separator.c
diff --git a/redo/windows/slider.c b/windows/slider.c
similarity index 100%
rename from redo/windows/slider.c
rename to windows/slider.c
diff --git a/redo/windows/spinbox.c b/windows/spinbox.c
similarity index 100%
rename from redo/windows/spinbox.c
rename to windows/spinbox.c
diff --git a/redo/windows/stddialogs.c b/windows/stddialogs.c
similarity index 100%
rename from redo/windows/stddialogs.c
rename to windows/stddialogs.c
diff --git a/redo/windows/tab.c b/windows/tab.c
similarity index 100%
rename from redo/windows/tab.c
rename to windows/tab.c
diff --git a/redo/windows/tabpage.c b/windows/tabpage.c
similarity index 100%
rename from redo/windows/tabpage.c
rename to windows/tabpage.c
diff --git a/redo/windows/text.c b/windows/text.c
similarity index 100%
rename from redo/windows/text.c
rename to windows/text.c
diff --git a/redo/windows/uipriv_windows.h b/windows/uipriv_windows.h
similarity index 100%
rename from redo/windows/uipriv_windows.h
rename to windows/uipriv_windows.h
diff --git a/redo/windows/util.c b/windows/util.c
similarity index 100%
rename from redo/windows/util.c
rename to windows/util.c
diff --git a/redo/windows/utilwin.c b/windows/utilwin.c
similarity index 100%
rename from redo/windows/utilwin.c
rename to windows/utilwin.c
diff --git a/redo/windows/winapi.h b/windows/winapi.h
similarity index 100%
rename from redo/windows/winapi.h
rename to windows/winapi.h
diff --git a/redo/windows/window.c b/windows/window.c
similarity index 100%
rename from redo/windows/window.c
rename to windows/window.c