Reorganize the entity package