Refactoring structure.