Modified file structure

Modified file structure