Add more structure to the suggested structure in lab 2