The machiya and tsuboniwa of Kyoto