Changes reflecting new directory structure and other ...