adjusting to new directory layout