WIP package refactor

 * fix imports
Merge remote-tracking branch 'jwhonce/wip/refactor' into refactor