Changed file locations and orginized the folders
Revert "Changed file locations and orginized the folders"

This reverts commit 48a2f660973dca23cdd2692f0418cf09de03ba6e.
Changed file locations and orginized the folder.