directory layout amended