Revert "base folders"

This reverts commit 47fe5b9ee375d46ac4da4cc40b1555a83114ee32.