Namespace refactoring (part 1)
Namespace refactoring (part 2)
Namespace refactoring (part 3)
Namespace refactoring (part 4)
Namespace refactoring (part 5)