Revert "base folder structure"

This reverts commit d0a5bc11f88b141c40c2ae0de60ac380232b80b2.