changed folder Structure