Move entities to separated package