changed dir layout again; added configs (untested)