Move commands to seperate files