Added EntityManager
Moved some classes; added more assets