Fixed class structure
Changed EntityManager dependence
Deleted entities
Deleted entity test
Changes in EntityManagerBuilder
Changes in construct & setUp
Fixed EntityManagerBuilder