organized files with groupings, added base model classes