config improved
folder structure2