Fixed wrong imports
Updated refactorization to be compliant with ODM
Merge pull request #165 from Bladrak/appliedCorebundleRefacto

Applied CoreBundle refactorization