namespace all the things! also file renames.