restructuring - pass 1
restruct - pass 2
restruct - pass 3
staging sync