moved some classes under different namespaces