pavo: adjusted folder structure