Removed parser.h/.cc to be redesigned