refactoring package name + folder name