refactor(UriBuilder): Refactoring *UriBuilders to be handle edge cases and be simpler