Significant changes to directory structure