Moving all Builder classes back into main builder class to keep  things together.