Updated analysis/plot to new directory structure