enhanced directory structure