Revert "Feeder folder"

This reverts commit 919dd9d2f2893ab95ca7433dffe3722759b094c2.