Split into files

For #25

Do you want the commands to be split even more?