New data folders to make upgrading easier