Move the rest of commands to separate files

Also remove duplication of command loading in specs