Structure refashionment

Structure refashionment