New structure

The model is up to date for lab2 and the new structure for lab3 has been
initiated.