Keep variables concerned with layout in the master file but pull out the default layout into a separate file. Change-Id: I4acc2937f8e8a76274a3ffb76e3729dc89ce1ad7