Changed directories to make more sense