Cool map.
But it's different than I imagined it. The stables (in my mind) were where the great hall should be, and vice versa. I imagined the residential wing to be one long, L-shaped hallway on two sides of the kitchen/great hall block, with rooms on one side and doors to the k/gh on the other. And the stables were somehow connected to the building.
By the way, Gárwine will take Room #6.
And also, which direction is north?