Changes to the analysis code and the directory location of some of the files in order to group via how they are used.