Revised directory structure.
Revise directory structure.