Structure refactored.