Move a few classes and categories so they have their own files.