Updated dependencies to single components

* Also fixed some old namespaces