Project structure updated and new lab added