move layout and heading changing packages from pkgcomp to mclass