Uniform grade-level structure coming for Catholic schools by 2015-16