Restructure cms-* pages