Changed directory structure to reflect sources of driving cycles