Some minor reorganization