diff --git a/redo/area.go b/area.go
similarity index 100%
rename from redo/area.go
rename to area.go
diff --git a/redo/area_darwin.go b/area_darwin.go
similarity index 100%
rename from redo/area_darwin.go
rename to area_darwin.go
diff --git a/redo/area_darwin.m b/area_darwin.m
similarity index 100%
rename from redo/area_darwin.m
rename to area_darwin.m
diff --git a/redo/area_unix.go b/area_unix.go
similarity index 100%
rename from redo/area_unix.go
rename to area_unix.go
diff --git a/redo/area_windows.c b/area_windows.c
similarity index 100%
rename from redo/area_windows.c
rename to area_windows.c
diff --git a/redo/area_windows.go b/area_windows.go
similarity index 100%
rename from redo/area_windows.go
rename to area_windows.go
diff --git a/redo/basicctrls.go b/basicctrls.go
similarity index 100%
rename from redo/basicctrls.go
rename to basicctrls.go
diff --git a/redo/basicctrls_darwin.m b/basicctrls_darwin.m
similarity index 100%
rename from redo/basicctrls_darwin.m
rename to basicctrls_darwin.m
diff --git a/redo/basicctrls_windows.c b/basicctrls_windows.c
similarity index 100%
rename from redo/basicctrls_windows.c
rename to basicctrls_windows.c
diff --git a/redo/button_darwin.go b/button_darwin.go
similarity index 100%
rename from redo/button_darwin.go
rename to button_darwin.go
diff --git a/redo/button_unix.go b/button_unix.go
similarity index 100%
rename from redo/button_unix.go
rename to button_unix.go
diff --git a/redo/button_windows.go b/button_windows.go
similarity index 100%
rename from redo/button_windows.go
rename to button_windows.go
diff --git a/redo/checkbox_darwin.go b/checkbox_darwin.go
similarity index 100%
rename from redo/checkbox_darwin.go
rename to checkbox_darwin.go
diff --git a/redo/checkbox_unix.go b/checkbox_unix.go
similarity index 100%
rename from redo/checkbox_unix.go
rename to checkbox_unix.go
diff --git a/redo/checkbox_windows.go b/checkbox_windows.go
similarity index 100%
rename from redo/checkbox_windows.go
rename to checkbox_windows.go
diff --git a/redo/comctl32_windows.c b/comctl32_windows.c
similarity index 100%
rename from redo/comctl32_windows.c
rename to comctl32_windows.c
diff --git a/redo/common_darwin.go b/common_darwin.go
similarity index 100%
rename from redo/common_darwin.go
rename to common_darwin.go
diff --git a/redo/common_darwin.m b/common_darwin.m
similarity index 100%
rename from redo/common_darwin.m
rename to common_darwin.m
diff --git a/redo/common_unix.go b/common_unix.go
similarity index 100%
rename from redo/common_unix.go
rename to common_unix.go
diff --git a/redo/common_windows.c b/common_windows.c
similarity index 100%
rename from redo/common_windows.c
rename to common_windows.c
diff --git a/redo/common_windows.go b/common_windows.go
similarity index 100%
rename from redo/common_windows.go
rename to common_windows.go
diff --git a/redo/container.go b/container.go
similarity index 100%
rename from redo/container.go
rename to container.go
diff --git a/redo/container_darwin.go b/container_darwin.go
similarity index 100%
rename from redo/container_darwin.go
rename to container_darwin.go
diff --git a/redo/container_darwin.m b/container_darwin.m
similarity index 100%
rename from redo/container_darwin.m
rename to container_darwin.m
diff --git a/redo/container_unix.c b/container_unix.c
similarity index 100%
rename from redo/container_unix.c
rename to container_unix.c
diff --git a/redo/container_unix.go b/container_unix.go
similarity index 100%
rename from redo/container_unix.go
rename to container_unix.go
diff --git a/redo/container_windows.c b/container_windows.c
similarity index 100%
rename from redo/container_windows.c
rename to container_windows.c
diff --git a/redo/container_windows.go b/container_windows.go
similarity index 100%
rename from redo/container_windows.go
rename to container_windows.go
diff --git a/redo/control.go b/control.go
similarity index 100%
rename from redo/control.go
rename to control.go
diff --git a/redo/control_darwin.go b/control_darwin.go
similarity index 100%
rename from redo/control_darwin.go
rename to control_darwin.go
diff --git a/redo/control_darwin.m b/control_darwin.m
similarity index 100%
rename from redo/control_darwin.m
rename to control_darwin.m
diff --git a/redo/control_unix.go b/control_unix.go
similarity index 100%
rename from redo/control_unix.go
rename to control_unix.go
diff --git a/redo/control_windows.c b/control_windows.c
similarity index 100%
rename from redo/control_windows.c
rename to control_windows.c
diff --git a/redo/control_windows.go b/control_windows.go
similarity index 100%
rename from redo/control_windows.go
rename to control_windows.go
diff --git a/redo/controlbase.sh b/controlbase.sh
similarity index 100%
rename from redo/controlbase.sh
rename to controlbase.sh
diff --git a/redo/dialog.go b/dialog.go
similarity index 100%
rename from redo/dialog.go
rename to dialog.go
diff --git a/redo/dialog_darwin.go b/dialog_darwin.go
similarity index 100%
rename from redo/dialog_darwin.go
rename to dialog_darwin.go
diff --git a/redo/dialog_darwin.m b/dialog_darwin.m
similarity index 100%
rename from redo/dialog_darwin.m
rename to dialog_darwin.m
diff --git a/redo/dialog_unix.go b/dialog_unix.go
similarity index 100%
rename from redo/dialog_unix.go
rename to dialog_unix.go
diff --git a/redo/dialog_windows.c b/dialog_windows.c
similarity index 100%
rename from redo/dialog_windows.c
rename to dialog_windows.c
diff --git a/redo/dialog_windows.go b/dialog_windows.go
similarity index 100%
rename from redo/dialog_windows.go
rename to dialog_windows.go
diff --git a/redo/doc.go b/doc.go
similarity index 100%
rename from redo/doc.go
rename to doc.go
diff --git a/redo/events_darwin.go b/events_darwin.go
similarity index 100%
rename from redo/events_darwin.go
rename to events_darwin.go
diff --git a/redo/events_notdarwin.go b/events_notdarwin.go
similarity index 100%
rename from redo/events_notdarwin.go
rename to events_notdarwin.go
diff --git a/redo/future b/future
similarity index 100%
rename from redo/future
rename to future
diff --git a/redo/grid.go b/grid.go
similarity index 100%
rename from redo/grid.go
rename to grid.go
diff --git a/redo/group_darwin.go b/group_darwin.go
similarity index 100%
rename from redo/group_darwin.go
rename to group_darwin.go
diff --git a/redo/group_unix.go b/group_unix.go
similarity index 100%
rename from redo/group_unix.go
rename to group_unix.go
diff --git a/redo/group_windows.go b/group_windows.go
similarity index 100%
rename from redo/group_windows.go
rename to group_windows.go
diff --git a/redo/gtk_unix.h b/gtk_unix.h
similarity index 100%
rename from redo/gtk_unix.h
rename to gtk_unix.h
diff --git a/redo/imagelist.go b/imagelist.go
similarity index 100%
rename from redo/imagelist.go
rename to imagelist.go
diff --git a/redo/imagelist_darwin.go b/imagelist_darwin.go
similarity index 100%
rename from redo/imagelist_darwin.go
rename to imagelist_darwin.go
diff --git a/redo/imagelist_darwin.m b/imagelist_darwin.m
similarity index 100%
rename from redo/imagelist_darwin.m
rename to imagelist_darwin.m
diff --git a/redo/imagelist_unix.go b/imagelist_unix.go
similarity index 100%
rename from redo/imagelist_unix.go
rename to imagelist_unix.go
diff --git a/redo/imagelist_windows.c b/imagelist_windows.c
similarity index 100%
rename from redo/imagelist_windows.c
rename to imagelist_windows.c
diff --git a/redo/imagelist_windows.go b/imagelist_windows.go
similarity index 100%
rename from redo/imagelist_windows.go
rename to imagelist_windows.go
diff --git a/redo/init_windows.c b/init_windows.c
similarity index 100%
rename from redo/init_windows.c
rename to init_windows.c
diff --git a/redo/label_darwin.go b/label_darwin.go
similarity index 100%
rename from redo/label_darwin.go
rename to label_darwin.go
diff --git a/redo/label_unix.go b/label_unix.go
similarity index 100%
rename from redo/label_unix.go
rename to label_unix.go
diff --git a/redo/label_windows.go b/label_windows.go
similarity index 100%
rename from redo/label_windows.go
rename to label_windows.go
diff --git a/redo/mergeback/layout.go b/mergeback/layout.go
similarity index 100%
rename from redo/mergeback/layout.go
rename to mergeback/layout.go
diff --git a/redo/mergeback/table_mouseleave_windows.c b/mergeback/table_mouseleave_windows.c
similarity index 100%
rename from redo/mergeback/table_mouseleave_windows.c
rename to mergeback/table_mouseleave_windows.c
diff --git a/redo/mergeback/windows-one-tab.go b/mergeback/windows-one-tab.go
similarity index 100%
rename from redo/mergeback/windows-one-tab.go
rename to mergeback/windows-one-tab.go
diff --git a/redo/objc_darwin.h b/objc_darwin.h
similarity index 100%
rename from redo/objc_darwin.h
rename to objc_darwin.h
diff --git a/redo/proposals/sidebar.md b/proposals/sidebar.md
similarity index 100%
rename from redo/proposals/sidebar.md
rename to proposals/sidebar.md
diff --git a/redo/proposals/tree.md b/proposals/tree.md
similarity index 100%
rename from redo/proposals/tree.md
rename to proposals/tree.md
diff --git a/redo/scrapped b/scrapped
similarity index 100%
rename from redo/scrapped
rename to scrapped
diff --git a/redo/stack.go b/stack.go
similarity index 100%
rename from redo/stack.go
rename to stack.go
diff --git a/redo/tab_darwin.go b/tab_darwin.go
similarity index 100%
rename from redo/tab_darwin.go
rename to tab_darwin.go
diff --git a/redo/tab_darwin.m b/tab_darwin.m
similarity index 100%
rename from redo/tab_darwin.m
rename to tab_darwin.m
diff --git a/redo/tab_unix.go b/tab_unix.go
similarity index 100%
rename from redo/tab_unix.go
rename to tab_unix.go
diff --git a/redo/tab_windows.c b/tab_windows.c
similarity index 100%
rename from redo/tab_windows.c
rename to tab_windows.c
diff --git a/redo/tab_windows.go b/tab_windows.go
similarity index 100%
rename from redo/tab_windows.go
rename to tab_windows.go
diff --git a/redo/table.go b/table.go
similarity index 100%
rename from redo/table.go
rename to table.go
diff --git a/redo/table_darwin.go b/table_darwin.go
similarity index 100%
rename from redo/table_darwin.go
rename to table_darwin.go
diff --git a/redo/table_darwin.m b/table_darwin.m
similarity index 100%
rename from redo/table_darwin.m
rename to table_darwin.m
diff --git a/redo/table_unix.c b/table_unix.c
similarity index 100%
rename from redo/table_unix.c
rename to table_unix.c
diff --git a/redo/table_unix.go b/table_unix.go
similarity index 100%
rename from redo/table_unix.go
rename to table_unix.go
diff --git a/redo/table_windows.c b/table_windows.c
similarity index 100%
rename from redo/table_windows.c
rename to table_windows.c
diff --git a/redo/table_windows.go b/table_windows.go
similarity index 100%
rename from redo/table_windows.go
rename to table_windows.go
diff --git a/redo/textfield_darwin.go b/textfield_darwin.go
similarity index 100%
rename from redo/textfield_darwin.go
rename to textfield_darwin.go
diff --git a/redo/textfield_unix.go b/textfield_unix.go
similarity index 100%
rename from redo/textfield_unix.go
rename to textfield_unix.go
diff --git a/redo/textfield_windows.go b/textfield_windows.go
similarity index 100%
rename from redo/textfield_windows.go
rename to textfield_windows.go
diff --git a/redo/uitask.go b/uitask.go
similarity index 100%
rename from redo/uitask.go
rename to uitask.go
diff --git a/redo/uitask_darwin.go b/uitask_darwin.go
similarity index 100%
rename from redo/uitask_darwin.go
rename to uitask_darwin.go
diff --git a/redo/uitask_darwin.m b/uitask_darwin.m
similarity index 100%
rename from redo/uitask_darwin.m
rename to uitask_darwin.m
diff --git a/redo/uitask_unix.go b/uitask_unix.go
similarity index 100%
rename from redo/uitask_unix.go
rename to uitask_unix.go
diff --git a/redo/uitask_windows.c b/uitask_windows.c
similarity index 100%
rename from redo/uitask_windows.c
rename to uitask_windows.c
diff --git a/redo/uitask_windows.go b/uitask_windows.go
similarity index 100%
rename from redo/uitask_windows.go
rename to uitask_windows.go
diff --git a/redo/warningpopover_darwin.m b/warningpopover_darwin.m
similarity index 100%
rename from redo/warningpopover_darwin.m
rename to warningpopover_darwin.m
diff --git a/redo/winapi_windows.h b/winapi_windows.h
similarity index 100%
rename from redo/winapi_windows.h
rename to winapi_windows.h
diff --git a/redo/window.go b/window.go
similarity index 100%
rename from redo/window.go
rename to window.go
diff --git a/redo/window_darwin.go b/window_darwin.go
similarity index 100%
rename from redo/window_darwin.go
rename to window_darwin.go
diff --git a/redo/window_darwin.m b/window_darwin.m
similarity index 100%
rename from redo/window_darwin.m
rename to window_darwin.m
diff --git a/redo/window_unix.go b/window_unix.go
similarity index 100%
rename from redo/window_unix.go
rename to window_unix.go
diff --git a/redo/window_windows.c b/window_windows.c
similarity index 100%
rename from redo/window_windows.c
rename to window_windows.c
diff --git a/redo/window_windows.go b/window_windows.go
similarity index 100%
rename from redo/window_windows.go
rename to window_windows.go
diff --git a/redo/yz_icons_test.go b/yz_icons_test.go
similarity index 100%
rename from redo/yz_icons_test.go
rename to yz_icons_test.go
diff --git a/redo/yz_repaint_test.go b/yz_repaint_test.go
similarity index 100%
rename from redo/yz_repaint_test.go
rename to yz_repaint_test.go
diff --git a/redo/zz_test.go b/zz_test.go
similarity index 100%
rename from redo/zz_test.go
rename to zz_test.go