Added namespaces. Clean some legacy code.