Update first lab, add second lab
Update folder structure