Implemented new aggregation within aggregation model pattern into UI, file moving continues