renamed various files, namespaces, etc