Updated project deps
Rearranged namespaces again