Revert "Update Folders to match spec."

This reverts commit fd8fa136f5cec15302bf48bdd60761e057f960c4.

Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1
4 files changed