Folder Structure Change

No coding change.