Added namespaces to some classes