Reorganizing the scheme again.