Revert "refactored folder structure"

This reverts commit 7db2fd02873f98aab022ae87efce7cc40ed3946a.