Move commands into own files, as far as that is possible