Some refactoring at scanner level
Renamed scanner to parser