Fix layout issues from conversion.
Attempt at rewrite rules for old path names.