More changes and reorganizations