update to Lab 8 project structure