db adapter + folder restructure