changed folder structure again