refactoring structure name