move a few classes
remove redundant namespaces