It's worth taking a look at a plan again. With the nature of the site, my guess is with any such plan, the maintenance garage would have to be moved.
Bruce Langner