changed folder organization