Removed annotation test files from Doctrine annotations. Started small style refactoring of Di