Clean package

Separate the package from other things