Revert "Folder structure fix."

This reverts commit 38a083c7abcb339397fb4a9e14d2cf1e2a8f5efc.