Revert "Reorganized Folders"

This reverts commit 0a6ea0c21d4ac97c58fae6964af876cdb31113c5.