Modify file structure for develop branch