231150 separate entity_controller into separate file