moved the scans into the same module hierarchy. Renamed Scanner to Scan