Reorganized folder structure + lab4