Folder organization
Revert "Folder organization"

This reverts commit e61b03a0658e6671478a9e6ddeb88a61b38dc684.
Folder Organization