changed folder structure, location of certain files