Move to commands/* so both modules are autoloaded