Moved custom classes over to their own files.