Put public enums in their own files #4