Building new folder structure

Building new folder structure