Move Trajectory up from parsers, since it is the driver object