Revert "Folder structure change"

This reverts commit a25b7a47ed3e675971b10c5980ca5602143c01e1.