revised directory structure