feat(builder): main refactor and URI builder support