Why not have two locations? The map shows two distinct areas of the town, divided by a wall and gate. The outer section is the port and can contain the shipyard and tavern, as the first part of the current town does. The inner section contains more buildings, including the town hall (which in the current version is, if I recall correctly, out of town in yet another location, similar to "Strange House" on other islands).