Added facades to namespaces, refactoring.