General and vocational education in the school reform