Moved commands into separate files