Move namespace files to table files - #2878