Revert "Revert "Folder Setup""

This reverts commit 09c4e81d1dd11fd20bb4413d35eef3a77ec8a620.