fixed pom, moved Entities into Core