Tidying up & moving commands to their own files

Thanks to Ninjex for letting me borrow some of the code used to move
commands out into their own files.