Reorganized to make index.html in root