I would prefer that anything related to collections would be in one file. Now you have some additional file for entities. Move each entity to its parent file.