Moved cli.py into subpackage and changed to entry_points from scripts