Folder + namespace refactoring