fix(builer): decouple from controller

closes #1097