[Refactoring] Reorganizing Populator