Reverted back to vcsh's recommended mr repo layout.