updated dir layout