Improving directory structure.