Broke out the DataModel to a class per file.