Ok, so here's what I've come up with then, assuming I understood what you said about the purple wall. I don't think I'd add the doors just to fill in the gray area, but that's up to you. If I were to add a door, I'd add a double door on the green wall.