Move control commands to its own module