diff --git a/src/pkg/walk/Makefile b/Makefile
similarity index 100%
rename from src/pkg/walk/Makefile
rename to Makefile
diff --git a/src/pkg/walk/action.go b/action.go
similarity index 100%
rename from src/pkg/walk/action.go
rename to action.go
diff --git a/src/pkg/walk/actionlist.go b/actionlist.go
similarity index 100%
rename from src/pkg/walk/actionlist.go
rename to actionlist.go
diff --git a/src/pkg/walk/application.go b/application.go
similarity index 100%
rename from src/pkg/walk/application.go
rename to application.go
diff --git a/src/pkg/walk/bitmap.go b/bitmap.go
similarity index 100%
rename from src/pkg/walk/bitmap.go
rename to bitmap.go
diff --git a/src/pkg/walk/boxlayout.go b/boxlayout.go
similarity index 100%
rename from src/pkg/walk/boxlayout.go
rename to boxlayout.go
diff --git a/src/pkg/walk/brush.go b/brush.go
similarity index 100%
rename from src/pkg/walk/brush.go
rename to brush.go
diff --git a/src/pkg/walk/button.go b/button.go
similarity index 100%
rename from src/pkg/walk/button.go
rename to button.go
diff --git a/src/pkg/walk/cancelevent.go b/cancelevent.go
similarity index 100%
rename from src/pkg/walk/cancelevent.go
rename to cancelevent.go
diff --git a/src/pkg/walk/canvas.go b/canvas.go
similarity index 100%
rename from src/pkg/walk/canvas.go
rename to canvas.go
diff --git a/src/pkg/walk/checkbox.go b/checkbox.go
similarity index 100%
rename from src/pkg/walk/checkbox.go
rename to checkbox.go
diff --git a/src/pkg/walk/closeevent.go b/closeevent.go
similarity index 100%
rename from src/pkg/walk/closeevent.go
rename to closeevent.go
diff --git a/src/pkg/walk/color.go b/color.go
similarity index 100%
rename from src/pkg/walk/color.go
rename to color.go
diff --git a/src/pkg/walk/combobox.go b/combobox.go
similarity index 100%
rename from src/pkg/walk/combobox.go
rename to combobox.go
diff --git a/src/pkg/walk/comboboxitem.go b/comboboxitem.go
similarity index 100%
rename from src/pkg/walk/comboboxitem.go
rename to comboboxitem.go
diff --git a/src/pkg/walk/comboboxitemlist.go b/comboboxitemlist.go
similarity index 100%
rename from src/pkg/walk/comboboxitemlist.go
rename to comboboxitemlist.go
diff --git a/src/pkg/walk/commondialogs.go b/commondialogs.go
similarity index 100%
rename from src/pkg/walk/commondialogs.go
rename to commondialogs.go
diff --git a/src/pkg/walk/composite.go b/composite.go
similarity index 100%
rename from src/pkg/walk/composite.go
rename to composite.go
diff --git a/src/pkg/walk/container.go b/container.go
similarity index 100%
rename from src/pkg/walk/container.go
rename to container.go
diff --git a/src/pkg/walk/cursor.go b/cursor.go
similarity index 100%
rename from src/pkg/walk/cursor.go
rename to cursor.go
diff --git a/src/pkg/walk/customwidget.go b/customwidget.go
similarity index 100%
rename from src/pkg/walk/customwidget.go
rename to customwidget.go
diff --git a/src/pkg/walk/dateedit.go b/dateedit.go
similarity index 100%
rename from src/pkg/walk/dateedit.go
rename to dateedit.go
diff --git a/src/pkg/walk/dialog.go b/dialog.go
similarity index 100%
rename from src/pkg/walk/dialog.go
rename to dialog.go
diff --git a/src/pkg/walk/document.go b/document.go
similarity index 100%
rename from src/pkg/walk/document.go
rename to document.go
diff --git a/src/pkg/walk/error.go b/error.go
similarity index 100%
rename from src/pkg/walk/error.go
rename to error.go
diff --git a/src/pkg/walk/errorevent.go b/errorevent.go
similarity index 100%
rename from src/pkg/walk/errorevent.go
rename to errorevent.go
diff --git a/src/pkg/walk/event.go b/event.go
similarity index 100%
rename from src/pkg/walk/event.go
rename to event.go
diff --git a/src/cmd/examples/drawing/Makefile b/examples/drawing/Makefile
similarity index 100%
rename from src/cmd/examples/drawing/Makefile
rename to examples/drawing/Makefile
diff --git a/src/cmd/examples/drawing/drawing.exe.manifest b/examples/drawing/drawing.exe.manifest
similarity index 100%
rename from src/cmd/examples/drawing/drawing.exe.manifest
rename to examples/drawing/drawing.exe.manifest
diff --git a/src/cmd/examples/drawing/drawing.go b/examples/drawing/drawing.go
similarity index 100%
rename from src/cmd/examples/drawing/drawing.go
rename to examples/drawing/drawing.go
diff --git a/src/cmd/examples/filebrowser/Makefile b/examples/filebrowser/Makefile
similarity index 100%
rename from src/cmd/examples/filebrowser/Makefile
rename to examples/filebrowser/Makefile
diff --git a/src/cmd/examples/filebrowser/filebrowser.exe.manifest b/examples/filebrowser/filebrowser.exe.manifest
similarity index 100%
rename from src/cmd/examples/filebrowser/filebrowser.exe.manifest
rename to examples/filebrowser/filebrowser.exe.manifest
diff --git a/src/cmd/examples/filebrowser/filebrowser.go b/examples/filebrowser/filebrowser.go
similarity index 100%
rename from src/cmd/examples/filebrowser/filebrowser.go
rename to examples/filebrowser/filebrowser.go
diff --git a/src/cmd/examples/imageviewer/Makefile b/examples/imageviewer/Makefile
similarity index 100%
rename from src/cmd/examples/imageviewer/Makefile
rename to examples/imageviewer/Makefile
diff --git a/src/cmd/examples/imageviewer/imageviewer.exe.manifest b/examples/imageviewer/imageviewer.exe.manifest
similarity index 100%
rename from src/cmd/examples/imageviewer/imageviewer.exe.manifest
rename to examples/imageviewer/imageviewer.exe.manifest
diff --git a/src/cmd/examples/imageviewer/imageviewer.go b/examples/imageviewer/imageviewer.go
similarity index 100%
rename from src/cmd/examples/imageviewer/imageviewer.go
rename to examples/imageviewer/imageviewer.go
diff --git a/src/cmd/examples/img/open.png b/examples/img/open.png
similarity index 100%
rename from src/cmd/examples/img/open.png
rename to examples/img/open.png
diff --git a/src/cmd/examples/img/plus.png b/examples/img/plus.png
similarity index 100%
rename from src/cmd/examples/img/plus.png
rename to examples/img/plus.png
diff --git a/src/cmd/examples/img/x.ico b/examples/img/x.ico
similarity index 100%
rename from src/cmd/examples/img/x.ico
rename to examples/img/x.ico
diff --git a/src/cmd/examples/notifyicon/Makefile b/examples/notifyicon/Makefile
similarity index 100%
rename from src/cmd/examples/notifyicon/Makefile
rename to examples/notifyicon/Makefile
diff --git a/src/cmd/examples/notifyicon/notifyicon.exe.manifest b/examples/notifyicon/notifyicon.exe.manifest
similarity index 100%
rename from src/cmd/examples/notifyicon/notifyicon.exe.manifest
rename to examples/notifyicon/notifyicon.exe.manifest
diff --git a/src/cmd/examples/notifyicon/notifyicon.go b/examples/notifyicon/notifyicon.go
similarity index 100%
rename from src/cmd/examples/notifyicon/notifyicon.go
rename to examples/notifyicon/notifyicon.go
diff --git a/src/cmd/examples/printing/Makefile b/examples/printing/Makefile
similarity index 100%
rename from src/cmd/examples/printing/Makefile
rename to examples/printing/Makefile
diff --git a/src/cmd/examples/printing/printing.exe.manifest b/examples/printing/printing.exe.manifest
similarity index 100%
rename from src/cmd/examples/printing/printing.exe.manifest
rename to examples/printing/printing.exe.manifest
diff --git a/src/cmd/examples/printing/printing.go b/examples/printing/printing.go
similarity index 100%
rename from src/cmd/examples/printing/printing.go
rename to examples/printing/printing.go
diff --git a/src/cmd/examples/tableview/Makefile b/examples/tableview/Makefile
similarity index 100%
rename from src/cmd/examples/tableview/Makefile
rename to examples/tableview/Makefile
diff --git a/src/cmd/examples/tableview/tableview.exe.manifest b/examples/tableview/tableview.exe.manifest
similarity index 100%
rename from src/cmd/examples/tableview/tableview.exe.manifest
rename to examples/tableview/tableview.exe.manifest
diff --git a/src/cmd/examples/tableview/tableview.go b/examples/tableview/tableview.go
similarity index 100%
rename from src/cmd/examples/tableview/tableview.go
rename to examples/tableview/tableview.go
diff --git a/src/cmd/examples/webbrowser/Makefile b/examples/webbrowser/Makefile
similarity index 100%
rename from src/cmd/examples/webbrowser/Makefile
rename to examples/webbrowser/Makefile
diff --git a/src/cmd/examples/webbrowser/webbrowser.exe.manifest b/examples/webbrowser/webbrowser.exe.manifest
similarity index 100%
rename from src/cmd/examples/webbrowser/webbrowser.exe.manifest
rename to examples/webbrowser/webbrowser.exe.manifest
diff --git a/src/cmd/examples/webbrowser/webbrowser.go b/examples/webbrowser/webbrowser.go
similarity index 100%
rename from src/cmd/examples/webbrowser/webbrowser.go
rename to examples/webbrowser/webbrowser.go
diff --git a/src/pkg/walk/font.go b/font.go
similarity index 100%
rename from src/pkg/walk/font.go
rename to font.go
diff --git a/src/pkg/walk/gridlayout.go b/gridlayout.go
similarity index 100%
rename from src/pkg/walk/gridlayout.go
rename to gridlayout.go
diff --git a/src/pkg/walk/groupbox.go b/groupbox.go
similarity index 100%
rename from src/pkg/walk/groupbox.go
rename to groupbox.go
diff --git a/src/pkg/walk/icon.go b/icon.go
similarity index 100%
rename from src/pkg/walk/icon.go
rename to icon.go
diff --git a/src/pkg/walk/image.go b/image.go
similarity index 100%
rename from src/pkg/walk/image.go
rename to image.go
diff --git a/src/pkg/walk/imagelist.go b/imagelist.go
similarity index 100%
rename from src/pkg/walk/imagelist.go
rename to imagelist.go
diff --git a/src/pkg/walk/imageview.go b/imageview.go
similarity index 100%
rename from src/pkg/walk/imageview.go
rename to imageview.go
diff --git a/src/pkg/walk/indexlist.go b/indexlist.go
similarity index 100%
rename from src/pkg/walk/indexlist.go
rename to indexlist.go
diff --git a/src/pkg/walk/inifilesettings.go b/inifilesettings.go
similarity index 100%
rename from src/pkg/walk/inifilesettings.go
rename to inifilesettings.go
diff --git a/src/pkg/walk/intevent.go b/intevent.go
similarity index 100%
rename from src/pkg/walk/intevent.go
rename to intevent.go
diff --git a/src/pkg/walk/keyevent.go b/keyevent.go
similarity index 100%
rename from src/pkg/walk/keyevent.go
rename to keyevent.go
diff --git a/src/pkg/walk/label.go b/label.go
similarity index 100%
rename from src/pkg/walk/label.go
rename to label.go
diff --git a/src/pkg/walk/lineedit.go b/lineedit.go
similarity index 100%
rename from src/pkg/walk/lineedit.go
rename to lineedit.go
diff --git a/src/pkg/walk/mainwindow.go b/mainwindow.go
similarity index 100%
rename from src/pkg/walk/mainwindow.go
rename to mainwindow.go
diff --git a/src/pkg/walk/menu.go b/menu.go
similarity index 100%
rename from src/pkg/walk/menu.go
rename to menu.go
diff --git a/src/pkg/walk/messagebox.go b/messagebox.go
similarity index 100%
rename from src/pkg/walk/messagebox.go
rename to messagebox.go
diff --git a/src/pkg/walk/metafile.go b/metafile.go
similarity index 100%
rename from src/pkg/walk/metafile.go
rename to metafile.go
diff --git a/src/pkg/walk/mouseevent.go b/mouseevent.go
similarity index 100%
rename from src/pkg/walk/mouseevent.go
rename to mouseevent.go
diff --git a/src/pkg/walk/notifyicon.go b/notifyicon.go
similarity index 100%
rename from src/pkg/walk/notifyicon.go
rename to notifyicon.go
diff --git a/src/pkg/walk/numberedit.go b/numberedit.go
similarity index 100%
rename from src/pkg/walk/numberedit.go
rename to numberedit.go
diff --git a/src/pkg/walk/page.go b/page.go
similarity index 100%
rename from src/pkg/walk/page.go
rename to page.go
diff --git a/src/pkg/walk/pageinfo.go b/pageinfo.go
similarity index 100%
rename from src/pkg/walk/pageinfo.go
rename to pageinfo.go
diff --git a/src/pkg/walk/papersize.go b/papersize.go
similarity index 100%
rename from src/pkg/walk/papersize.go
rename to papersize.go
diff --git a/src/pkg/walk/papersource.go b/papersource.go
similarity index 100%
rename from src/pkg/walk/papersource.go
rename to papersource.go
diff --git a/src/pkg/walk/path.go b/path.go
similarity index 100%
rename from src/pkg/walk/path.go
rename to path.go
diff --git a/src/pkg/walk/pen.go b/pen.go
similarity index 100%
rename from src/pkg/walk/pen.go
rename to pen.go
diff --git a/src/pkg/walk/point.go b/point.go
similarity index 100%
rename from src/pkg/walk/point.go
rename to point.go
diff --git a/src/pkg/walk/printerinfo.go b/printerinfo.go
similarity index 100%
rename from src/pkg/walk/printerinfo.go
rename to printerinfo.go
diff --git a/src/pkg/walk/printing.go b/printing.go
similarity index 100%
rename from src/pkg/walk/printing.go
rename to printing.go
diff --git a/src/pkg/walk/progressbar.go b/progressbar.go
similarity index 100%
rename from src/pkg/walk/progressbar.go
rename to progressbar.go
diff --git a/src/pkg/walk/pushbutton.go b/pushbutton.go
similarity index 100%
rename from src/pkg/walk/pushbutton.go
rename to pushbutton.go
diff --git a/src/pkg/walk/radiobutton.go b/radiobutton.go
similarity index 100%
rename from src/pkg/walk/radiobutton.go
rename to radiobutton.go
diff --git a/src/pkg/walk/rectangle.go b/rectangle.go
similarity index 100%
rename from src/pkg/walk/rectangle.go
rename to rectangle.go
diff --git a/src/pkg/walk/registry.go b/registry.go
similarity index 100%
rename from src/pkg/walk/registry.go
rename to registry.go
diff --git a/src/pkg/walk/resolution.go b/resolution.go
similarity index 100%
rename from src/pkg/walk/resolution.go
rename to resolution.go
diff --git a/src/pkg/walk/simpletextitem.go b/simpletextitem.go
similarity index 100%
rename from src/pkg/walk/simpletextitem.go
rename to simpletextitem.go
diff --git a/src/pkg/walk/simpletypes.go b/simpletypes.go
similarity index 100%
rename from src/pkg/walk/simpletypes.go
rename to simpletypes.go
diff --git a/src/pkg/walk/size.go b/size.go
similarity index 100%
rename from src/pkg/walk/size.go
rename to size.go
diff --git a/src/pkg/walk/spacer.go b/spacer.go
similarity index 100%
rename from src/pkg/walk/spacer.go
rename to spacer.go
diff --git a/src/pkg/walk/splitter.go b/splitter.go
similarity index 100%
rename from src/pkg/walk/splitter.go
rename to splitter.go
diff --git a/src/pkg/walk/splitterhandle.go b/splitterhandle.go
similarity index 100%
rename from src/pkg/walk/splitterhandle.go
rename to splitterhandle.go
diff --git a/src/pkg/walk/splitterlayout.go b/splitterlayout.go
similarity index 100%
rename from src/pkg/walk/splitterlayout.go
rename to splitterlayout.go
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 2fe8c1cd..00000000
--- a/src/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-all: clean
-	make -C pkg/walk/winapi          install
-	make -C pkg/walk                 install
-	make -C cmd/tools/ui2walk        install
-	make -C cmd/examples/drawing
-	make -C cmd/examples/filebrowser
-	make -C cmd/examples/imageviewer
-	make -C cmd/examples/notifyicon
-	make -C cmd/examples/printing
-	make -C cmd/examples/tableview
-	make -C cmd/examples/webbrowser
-
-test: clean
-	make -C pkg/walk                 test
-
-clean:
-	make -C pkg/walk/winapi          clean
-	make -C pkg/walk                 clean
-	make -C cmd/tools/ui2walk        clean
-	make -C cmd/examples/drawing     clean
-	make -C cmd/examples/filebrowser clean
-	make -C cmd/examples/imageviewer clean
-	make -C cmd/examples/notifyicon  clean
-	make -C cmd/examples/printing    clean
-	make -C cmd/examples/tableview   clean
-	make -C cmd/examples/webbrowser  clean
-
-format:
-	gofmt -w .
diff --git a/src/pkg/walk/tableview.go b/tableview.go
similarity index 100%
rename from src/pkg/walk/tableview.go
rename to tableview.go
diff --git a/src/pkg/walk/tabpage.go b/tabpage.go
similarity index 100%
rename from src/pkg/walk/tabpage.go
rename to tabpage.go
diff --git a/src/pkg/walk/tabpagelist.go b/tabpagelist.go
similarity index 100%
rename from src/pkg/walk/tabpagelist.go
rename to tabpagelist.go
diff --git a/src/pkg/walk/tabwidget.go b/tabwidget.go
similarity index 100%
rename from src/pkg/walk/tabwidget.go
rename to tabwidget.go
diff --git a/src/pkg/walk/textedit.go b/textedit.go
similarity index 100%
rename from src/pkg/walk/textedit.go
rename to textedit.go
diff --git a/src/pkg/walk/toolbar.go b/toolbar.go
similarity index 100%
rename from src/pkg/walk/toolbar.go
rename to toolbar.go
diff --git a/src/cmd/tools/ui2walk/Makefile b/tools/ui2walk/Makefile
similarity index 100%
rename from src/cmd/tools/ui2walk/Makefile
rename to tools/ui2walk/Makefile
diff --git a/src/cmd/tools/ui2walk/ui2walk.go b/tools/ui2walk/ui2walk.go
similarity index 100%
rename from src/cmd/tools/ui2walk/ui2walk.go
rename to tools/ui2walk/ui2walk.go
diff --git a/src/pkg/walk/tooltip.go b/tooltip.go
similarity index 100%
rename from src/pkg/walk/tooltip.go
rename to tooltip.go
diff --git a/src/pkg/walk/toplevelwindow.go b/toplevelwindow.go
similarity index 100%
rename from src/pkg/walk/toplevelwindow.go
rename to toplevelwindow.go
diff --git a/src/pkg/walk/treeview.go b/treeview.go
similarity index 100%
rename from src/pkg/walk/treeview.go
rename to treeview.go
diff --git a/src/pkg/walk/treeviewitem.go b/treeviewitem.go
similarity index 100%
rename from src/pkg/walk/treeviewitem.go
rename to treeviewitem.go
diff --git a/src/pkg/walk/treeviewitemevent.go b/treeviewitemevent.go
similarity index 100%
rename from src/pkg/walk/treeviewitemevent.go
rename to treeviewitemevent.go
diff --git a/src/pkg/walk/treeviewitemlist.go b/treeviewitemlist.go
similarity index 100%
rename from src/pkg/walk/treeviewitemlist.go
rename to treeviewitemlist.go
diff --git a/src/pkg/walk/treeviewitemselectionevent.go b/treeviewitemselectionevent.go
similarity index 100%
rename from src/pkg/walk/treeviewitemselectionevent.go
rename to treeviewitemselectionevent.go
diff --git a/src/pkg/walk/util.go b/util.go
similarity index 100%
rename from src/pkg/walk/util.go
rename to util.go
diff --git a/src/pkg/walk/validators.go b/validators.go
similarity index 100%
rename from src/pkg/walk/validators.go
rename to validators.go
diff --git a/src/pkg/walk/walk.go b/walk.go
similarity index 100%
rename from src/pkg/walk/walk.go
rename to walk.go
diff --git a/src/pkg/walk/webview.go b/webview.go
similarity index 100%
rename from src/pkg/walk/webview.go
rename to webview.go
diff --git a/src/pkg/walk/webview_dwebbrowserevents2.go b/webview_dwebbrowserevents2.go
similarity index 100%
rename from src/pkg/walk/webview_dwebbrowserevents2.go
rename to webview_dwebbrowserevents2.go
diff --git a/src/pkg/walk/webview_idochostuihandler.go b/webview_idochostuihandler.go
similarity index 100%
rename from src/pkg/walk/webview_idochostuihandler.go
rename to webview_idochostuihandler.go
diff --git a/src/pkg/walk/webview_ioleclientsite.go b/webview_ioleclientsite.go
similarity index 100%
rename from src/pkg/walk/webview_ioleclientsite.go
rename to webview_ioleclientsite.go
diff --git a/src/pkg/walk/webview_ioleinplaceframe.go b/webview_ioleinplaceframe.go
similarity index 100%
rename from src/pkg/walk/webview_ioleinplaceframe.go
rename to webview_ioleinplaceframe.go
diff --git a/src/pkg/walk/webview_ioleinplacesite.go b/webview_ioleinplacesite.go
similarity index 100%
rename from src/pkg/walk/webview_ioleinplacesite.go
rename to webview_ioleinplacesite.go
diff --git a/src/pkg/walk/widget.go b/widget.go
similarity index 100%
rename from src/pkg/walk/widget.go
rename to widget.go
diff --git a/src/pkg/walk/widgetlist.go b/widgetlist.go
similarity index 100%
rename from src/pkg/walk/widgetlist.go
rename to widgetlist.go
diff --git a/src/pkg/walk/winapi/Makefile b/winapi/Makefile
similarity index 100%
rename from src/pkg/walk/winapi/Makefile
rename to winapi/Makefile
diff --git a/src/pkg/walk/winapi/advapi32.go b/winapi/advapi32.go
similarity index 100%
rename from src/pkg/walk/winapi/advapi32.go
rename to winapi/advapi32.go
diff --git a/src/pkg/walk/winapi/combobox.go b/winapi/combobox.go
similarity index 100%
rename from src/pkg/walk/winapi/combobox.go
rename to winapi/combobox.go
diff --git a/src/pkg/walk/winapi/comctl32.go b/winapi/comctl32.go
similarity index 100%
rename from src/pkg/walk/winapi/comctl32.go
rename to winapi/comctl32.go
diff --git a/src/pkg/walk/winapi/comdlg32.go b/winapi/comdlg32.go
similarity index 100%
rename from src/pkg/walk/winapi/comdlg32.go
rename to winapi/comdlg32.go
diff --git a/src/pkg/walk/winapi/datetimepicker.go b/winapi/datetimepicker.go
similarity index 100%
rename from src/pkg/walk/winapi/datetimepicker.go
rename to winapi/datetimepicker.go
diff --git a/src/pkg/walk/winapi/edit.go b/winapi/edit.go
similarity index 100%
rename from src/pkg/walk/winapi/edit.go
rename to winapi/edit.go
diff --git a/src/pkg/walk/winapi/gdi32.go b/winapi/gdi32.go
similarity index 100%
rename from src/pkg/walk/winapi/gdi32.go
rename to winapi/gdi32.go
diff --git a/src/pkg/walk/winapi/gdiplus.go b/winapi/gdiplus.go
similarity index 100%
rename from src/pkg/walk/winapi/gdiplus.go
rename to winapi/gdiplus.go
diff --git a/src/pkg/walk/winapi/kernel32.go b/winapi/kernel32.go
similarity index 100%
rename from src/pkg/walk/winapi/kernel32.go
rename to winapi/kernel32.go
diff --git a/src/pkg/walk/winapi/listview.go b/winapi/listview.go
similarity index 100%
rename from src/pkg/walk/winapi/listview.go
rename to winapi/listview.go
diff --git a/src/pkg/walk/winapi/menu.go b/winapi/menu.go
similarity index 100%
rename from src/pkg/walk/winapi/menu.go
rename to winapi/menu.go
diff --git a/src/pkg/walk/winapi/ole32.go b/winapi/ole32.go
similarity index 100%
rename from src/pkg/walk/winapi/ole32.go
rename to winapi/ole32.go
diff --git a/src/pkg/walk/winapi/oleaut32.go b/winapi/oleaut32.go
similarity index 100%
rename from src/pkg/walk/winapi/oleaut32.go
rename to winapi/oleaut32.go
diff --git a/src/pkg/walk/winapi/shdocvw.go b/winapi/shdocvw.go
similarity index 100%
rename from src/pkg/walk/winapi/shdocvw.go
rename to winapi/shdocvw.go
diff --git a/src/pkg/walk/winapi/shell32.go b/winapi/shell32.go
similarity index 100%
rename from src/pkg/walk/winapi/shell32.go
rename to winapi/shell32.go
diff --git a/src/pkg/walk/winapi/tab.go b/winapi/tab.go
similarity index 100%
rename from src/pkg/walk/winapi/tab.go
rename to winapi/tab.go
diff --git a/src/pkg/walk/winapi/toolbar.go b/winapi/toolbar.go
similarity index 100%
rename from src/pkg/walk/winapi/toolbar.go
rename to winapi/toolbar.go
diff --git a/src/pkg/walk/winapi/tooltip.go b/winapi/tooltip.go
similarity index 100%
rename from src/pkg/walk/winapi/tooltip.go
rename to winapi/tooltip.go
diff --git a/src/pkg/walk/winapi/treeview.go b/winapi/treeview.go
similarity index 100%
rename from src/pkg/walk/winapi/treeview.go
rename to winapi/treeview.go
diff --git a/src/pkg/walk/winapi/updown.go b/winapi/updown.go
similarity index 100%
rename from src/pkg/walk/winapi/updown.go
rename to winapi/updown.go
diff --git a/src/pkg/walk/winapi/user32.go b/winapi/user32.go
similarity index 100%
rename from src/pkg/walk/winapi/user32.go
rename to winapi/user32.go
diff --git a/src/pkg/walk/winapi/uxtheme.go b/winapi/uxtheme.go
similarity index 100%
rename from src/pkg/walk/winapi/uxtheme.go
rename to winapi/uxtheme.go
diff --git a/src/pkg/walk/winapi/winapi.go b/winapi/winapi.go
similarity index 100%
rename from src/pkg/walk/winapi/winapi.go
rename to winapi/winapi.go
diff --git a/src/pkg/walk/winapi/winspool.go b/winapi/winspool.go
similarity index 100%
rename from src/pkg/walk/winapi/winspool.go
rename to winapi/winspool.go