Move scanner to scanner namespace