Renamed collection files to models