Revert "Cleanup folder structure"

This reverts commit a05f66e826e0460dc1c544dd711341f0150c3661.