Refactoring structure