Revert "Added support for sub folders"

This reverts commit 03fe5f1b967615db813fbf518c5a5b9d48008a23.