Revert "Revert "Folder Structure""

This reverts commit 7ddc8f1eb3071ed250fd8f6164b4a2717b0d1008.