convert remaining commands to command modules