Refactoring for restructuring