Revised directory structure