Start on package restructuring