more changes and reorganization