I think you're gonna have to find a compromise somewhere. The previous GM had a different idea of a layout than I, and so I probably got some wires crossed somewhere. Without a floorplan, that's just gonna happen. My apologies for any confusion on my part.
@Mychal'el should have final say on who is where, of course. But in the future I might suggest a drawing or something