Corrections to updated paths.
Merge branch 'restructure'