Finished major reorganization