Moved services to definition file, removing di-extra-bundle dependency