A bit of reorganization.