Some namespacing changes and added providers/factories for the frameworks used