group data models and categories together
restructuring files part 1
restructuring files part 2