#1 first batch of changes for decoupling analysis from index file
generation