Move Entity Class To Core