Move entities into entity directory