clean up and directory structure changes
Merge branch 'lesson2'