Continue packageification #7

Closed johnbrussell closed 4 years ago