Pull out some services into separate module
Merging latest directives changes