Updating setup.py for packaging + updating subcommand management