Make a module of the package and cleanup
Rename package to a module