Updated location of files to make more sense.