change namespacing and some filenames