Here is the (Stephen) Thomas Plan - updated to move the store room wall to the correct position.

And below is the Goad Plan for your opinions & feedback please:
(shaded dark red = partitions)

N.B: those two images are quite big (file size) so they might skip a bit.
Leave a comment: