Moved Scan class to Scanner header