More updates on directory structure