Generating folders but not feeling this format
Revert "Generating folders but not feeling this format"

This reverts commit 1e6bbee1ab3e7683086d845d8ff74c2c2b5dfab3.