Revert "new folder structure"

This reverts commit 4e92c65167c28b76c5103253676a75f70ef1c872.
rename files