changed folder structure w1