Reordering code in main.c
Adding option on scanner.l to read from a file