After much stuffing around, finally got this floor plan, you don't reckon those angled poles were hard to do!

I have angled out the rooms to echo the exterior walls.