fix up index page
Merge branch 'ch4' into ch5

* ch4:
  fix up index page
fix project structure