Structural refactoring