Start ensuring all types are in there own files.