lesson3 file structure + clean up lesson2