Added consistent structure for lab1