updated scaffolding now that City and Country are linked. (Fixed package
name so it is all lowercase)