diff --git a/prevlib/area.go b/area.go
similarity index 100%
rename from prevlib/area.go
rename to area.go
diff --git a/prevlib/area_darwin.go b/area_darwin.go
similarity index 100%
rename from prevlib/area_darwin.go
rename to area_darwin.go
diff --git a/prevlib/area_darwin.m b/area_darwin.m
similarity index 100%
rename from prevlib/area_darwin.m
rename to area_darwin.m
diff --git a/prevlib/area_unix.go b/area_unix.go
similarity index 100%
rename from prevlib/area_unix.go
rename to area_unix.go
diff --git a/prevlib/area_windows.go b/area_windows.go
similarity index 100%
rename from prevlib/area_windows.go
rename to area_windows.go
diff --git a/prevlib/button.go b/button.go
similarity index 100%
rename from prevlib/button.go
rename to button.go
diff --git a/prevlib/callbacks_unix.go b/callbacks_unix.go
similarity index 100%
rename from prevlib/callbacks_unix.go
rename to callbacks_unix.go
diff --git a/prevlib/checkbox.go b/checkbox.go
similarity index 100%
rename from prevlib/checkbox.go
rename to checkbox.go
diff --git a/prevlib/combobox.go b/combobox.go
similarity index 100%
rename from prevlib/combobox.go
rename to combobox.go
diff --git a/prevlib/combobox_darwin.m b/combobox_darwin.m
similarity index 100%
rename from prevlib/combobox_darwin.m
rename to combobox_darwin.m
diff --git a/prevlib/comctl_windows.go b/comctl_windows.go
similarity index 100%
rename from prevlib/comctl_windows.go
rename to comctl_windows.go
diff --git a/prevlib/common_windows.go b/common_windows.go
similarity index 100%
rename from prevlib/common_windows.go
rename to common_windows.go
diff --git a/prevlib/control.go b/control.go
similarity index 100%
rename from prevlib/control.go
rename to control.go
diff --git a/prevlib/controls_windows.go b/controls_windows.go
similarity index 100%
rename from prevlib/controls_windows.go
rename to controls_windows.go
diff --git a/prevlib/controlsize.go b/controlsize.go
similarity index 100%
rename from prevlib/controlsize.go
rename to controlsize.go
diff --git a/prevlib/controlsize_darwin.go b/controlsize_darwin.go
similarity index 100%
rename from prevlib/controlsize_darwin.go
rename to controlsize_darwin.go
diff --git a/prevlib/controlsize_unix.go b/controlsize_unix.go
similarity index 100%
rename from prevlib/controlsize_unix.go
rename to controlsize_unix.go
diff --git a/prevlib/controlsize_windows.go b/controlsize_windows.go
similarity index 100%
rename from prevlib/controlsize_windows.go
rename to controlsize_windows.go
diff --git a/prevlib/delegate_darwin.go b/delegate_darwin.go
similarity index 100%
rename from prevlib/delegate_darwin.go
rename to delegate_darwin.go
diff --git a/prevlib/delegateuitask_darwin.m b/delegateuitask_darwin.m
similarity index 100%
rename from prevlib/delegateuitask_darwin.m
rename to delegateuitask_darwin.m
diff --git a/prevlib/dialog.go b/dialog.go
similarity index 100%
rename from prevlib/dialog.go
rename to dialog.go
diff --git a/prevlib/dialog_darwin.go b/dialog_darwin.go
similarity index 100%
rename from prevlib/dialog_darwin.go
rename to dialog_darwin.go
diff --git a/prevlib/dialog_darwin.m b/dialog_darwin.m
similarity index 100%
rename from prevlib/dialog_darwin.m
rename to dialog_darwin.m
diff --git a/prevlib/dialog_unix.go b/dialog_unix.go
similarity index 100%
rename from prevlib/dialog_unix.go
rename to dialog_unix.go
diff --git a/prevlib/dialog_windows.go b/dialog_windows.go
similarity index 100%
rename from prevlib/dialog_windows.go
rename to dialog_windows.go
diff --git a/prevlib/doc.go b/doc.go
similarity index 100%
rename from prevlib/doc.go
rename to doc.go
diff --git a/prevlib/events_darwin.go b/events_darwin.go
similarity index 100%
rename from prevlib/events_darwin.go
rename to events_darwin.go
diff --git a/prevlib/events_notdarwin.go b/events_notdarwin.go
similarity index 100%
rename from prevlib/events_notdarwin.go
rename to events_notdarwin.go
diff --git a/prevlib/grid.go b/grid.go
similarity index 100%
rename from prevlib/grid.go
rename to grid.go
diff --git a/prevlib/gtk_unix.h b/gtk_unix.h
similarity index 100%
rename from prevlib/gtk_unix.h
rename to gtk_unix.h
diff --git a/prevlib/gtkcalls_unix.go b/gtkcalls_unix.go
similarity index 100%
rename from prevlib/gtkcalls_unix.go
rename to gtkcalls_unix.go
diff --git a/prevlib/gtkcasts_unix.go b/gtkcasts_unix.go
similarity index 100%
rename from prevlib/gtkcasts_unix.go
rename to gtkcasts_unix.go
diff --git a/prevlib/init_windows.go b/init_windows.go
similarity index 100%
rename from prevlib/init_windows.go
rename to init_windows.go
diff --git a/prevlib/label.go b/label.go
similarity index 100%
rename from prevlib/label.go
rename to label.go
diff --git a/prevlib/layout.go b/layout.go
similarity index 100%
rename from prevlib/layout.go
rename to layout.go
diff --git a/prevlib/lineedit.go b/lineedit.go
similarity index 100%
rename from prevlib/lineedit.go
rename to lineedit.go
diff --git a/prevlib/listbox.go b/listbox.go
similarity index 100%
rename from prevlib/listbox.go
rename to listbox.go
diff --git a/prevlib/listbox_darwin.go b/listbox_darwin.go
similarity index 100%
rename from prevlib/listbox_darwin.go
rename to listbox_darwin.go
diff --git a/prevlib/listbox_darwin.m b/listbox_darwin.m
similarity index 100%
rename from prevlib/listbox_darwin.m
rename to listbox_darwin.m
diff --git a/prevlib/listbox_unix.go b/listbox_unix.go
similarity index 100%
rename from prevlib/listbox_unix.go
rename to listbox_unix.go
diff --git a/prevlib/objc_darwin.go b/objc_darwin.go
similarity index 100%
rename from prevlib/objc_darwin.go
rename to objc_darwin.go
diff --git a/prevlib/objc_darwin.h b/objc_darwin.h
similarity index 100%
rename from prevlib/objc_darwin.h
rename to objc_darwin.h
diff --git a/prevlib/objc_darwin.m b/objc_darwin.m
similarity index 100%
rename from prevlib/objc_darwin.m
rename to objc_darwin.m
diff --git a/newplan b/olddocs/newplan
similarity index 100%
rename from newplan
rename to olddocs/newplan
diff --git a/prevlib/prefsize_darwin.m b/prefsize_darwin.m
similarity index 100%
rename from prevlib/prefsize_darwin.m
rename to prefsize_darwin.m
diff --git a/prevlib/progressbar.go b/progressbar.go
similarity index 100%
rename from prevlib/progressbar.go
rename to progressbar.go
diff --git a/prevlib/stack.go b/stack.go
similarity index 100%
rename from prevlib/stack.go
rename to stack.go
diff --git a/prevlib/stdfont_windows.go b/stdfont_windows.go
similarity index 100%
rename from prevlib/stdfont_windows.go
rename to stdfont_windows.go
diff --git a/prevlib/stdwndclass_windows.go b/stdwndclass_windows.go
similarity index 100%
rename from prevlib/stdwndclass_windows.go
rename to stdwndclass_windows.go
diff --git a/prevlib/sysdata.go b/sysdata.go
similarity index 100%
rename from prevlib/sysdata.go
rename to sysdata.go
diff --git a/prevlib/sysdata_darwin.go b/sysdata_darwin.go
similarity index 100%
rename from prevlib/sysdata_darwin.go
rename to sysdata_darwin.go
diff --git a/prevlib/sysdata_darwin.m b/sysdata_darwin.m
similarity index 100%
rename from prevlib/sysdata_darwin.m
rename to sysdata_darwin.m
diff --git a/prevlib/sysdata_unix.go b/sysdata_unix.go
similarity index 100%
rename from prevlib/sysdata_unix.go
rename to sysdata_unix.go
diff --git a/prevlib/sysdata_windows.go b/sysdata_windows.go
similarity index 100%
rename from prevlib/sysdata_windows.go
rename to sysdata_windows.go
diff --git a/prevlib/uitask.go b/uitask.go
similarity index 100%
rename from prevlib/uitask.go
rename to uitask.go
diff --git a/prevlib/uitask_darwin.go b/uitask_darwin.go
similarity index 100%
rename from prevlib/uitask_darwin.go
rename to uitask_darwin.go
diff --git a/prevlib/uitask_unix.go b/uitask_unix.go
similarity index 100%
rename from prevlib/uitask_unix.go
rename to uitask_unix.go
diff --git a/prevlib/uitask_windows.go b/uitask_windows.go
similarity index 100%
rename from prevlib/uitask_windows.go
rename to uitask_windows.go
diff --git a/prevlib/window.go b/window.go
similarity index 100%
rename from prevlib/window.go
rename to window.go
diff --git a/prevlib/zconstants_windows_386.go b/zconstants_windows_386.go
similarity index 100%
rename from prevlib/zconstants_windows_386.go
rename to zconstants_windows_386.go
diff --git a/prevlib/zconstants_windows_amd64.go b/zconstants_windows_amd64.go
similarity index 100%
rename from prevlib/zconstants_windows_amd64.go
rename to zconstants_windows_amd64.go