Modified Architecture

New Folder structure -