Removing class, creating 2 separate tracepoints2

Signed-off-by: Francis Deslauriers <fdeslaur@gmail.com>