Finish the reorganization