new Layout and file organisation