Small refactoring job. Added namespaces.