Some updates to support experiment 1. some filename path changes to work with different people