Fixed up associations with divisions, deleted old model files conflicting with subfolder models; REMIGRATE DB