Renamed some files to make more sense
Changes due to rename reflected in index.html