Updated folder structure for handin