Revert "folder structure"

This reverts commit 08db82593851264ce17f234f7d3d9822d1832435.