Revert directory structure changes
84 files changed