Begin restructure using infile model more