Updated folder and file organization