First steps splitting commands into seperate files.