rearrange types so scanner can be used in build def
add copy scanner to build