Revert "Refactor RC2 Folder to match"

This reverts commit 94ad95828b235f8257c82f34f3b44d5c02664d08.
Revert "Refactor RC1 Folder to match MK7 Folder"

This reverts commit 2a41f06062f1419ac7928b307ba9c02191b5fc23.