Reorganization almost done