moved ClassModel and FieldModel into their own package. Created tests and wrote the necessary infrastructure to get existing tests to pass.