Cleaning up some names and annotations.
Moving the EntityManager to be its own manager.
Overriding the DBAL where possible.