moved some Scanner methods to scan.cpp
moved more methods of Scanner from scan.h to scan.cpp