Move folders into dicty
Adjust code to new location of data