Fixed packaging

Packaged to allow easier use as a module, rather than just standalone CLI