Reorganize modules which implement commands
Fix to the debian generator