Refactoring: move classes to meet namespaces.