Tidied ModelManager
More Model adjustments
EntityManager tidied
EntityManager tests, move denormalization to independent services