Merged index2 into index
Moved js into separate file