EntityManager.php file structure re-organisation