RefactorStructure