further dir layout updates