WIP: Namespace refactor #2

Closed
pit wants to merge 1 commits from develop into NamespaceRenaming