Refactor Service to Builder.
Refactor Builder.
Refactor services.