changed folder stucture