Start of moving dispatcher commands to command sub-modules