Revert "Restructure folder and files"

This reverts commit 9f7f1c18cbe88896a89abb135946f2cefedeb3af.