Move index.html to root and fix references
move index.html to root
Merge branch 'master'