Move a few classes into their own file.