Structure refactoring