Manager uses driver interface
Factory moved under factory namespace
Resolver changed with driver
Updated service provider
Merge branch 'development'