Restructure to match SourceFormce