keeping dir layout clean