tosulliv: refactoring changes to layout files to accommodate
introduction of CCM