Change js structure to object-oriented
Resolve index.html conflict