Updated Code for folder struture