move Builders namespace out of Domain