update paths according to new folder organisation