Refactoring code to use small building builder and large building
builder so that we can use mediator the right way