Added new folder structure
Added new folder structure