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