refactor Eve\Builders\*