move builders to separate namespace