Restructuring: minor updates/shuffles