Main script moved into a package
Stuff reorganized in a package