Moved remaining commands to new classes