changed folder strcture