Revised directory structure.