Moved scanner.php
Minor fixes