Simplify the Command module and instead use pypi/Command