Fixed paths that broke with re-org