Made changes to the directory structure so the files are organized in a coherent fashion.