Better separation of classes
Removed all referenced to SerialParser.