renamed Scanner files for better clarity