Revert "Removed Scanner code"

This reverts commit b68a5332e4c50f4bef444363f2e2624b696ef074.