Switch from class to module
Made appropriate changes in cli.py