token: Reorganization, no real change.