Moving aggregation releated entities to proper location.