Refactored/merged the two sets of Place/Coord etc. Adjusted import/usgae
to match