moved classes to namespaces