Added new entity manager
Refactored some paths that are going to annoy some people :)
Added tests
THis has not been fully tested yet. Yeah I know I should work in a branch, but :P