Removed unused dependencies
Updated component definitions, added PluggableRouterBuilderFactory