Fixing botched directory structure.
280 files changed