Rearranging things a bit in the data folder