changed folder structure further