- pkg/{subsystem}/{package} style - modify Makefile to reflect the new style, consolidate various entries - add a dummy ``main.go`` at top level