Removed extracted components and adjusted bindings and namespaces.