switched index files for hcc, more changes