made model files consistent with where annotations are and field names and groups has all database fields now.