Significant change in directory structure, and we a new layout that should work well for this.