modified directory layout