Updated folder layout
Updated folder layout