Move Entities to Entity Class