Split classes out of the command file.