changed folder structure