Move commands into a separate command module