-import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;\r
-import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
-import org.eclipse.linuxtools.tmf.filter.ITmfFilter;\r
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;\r
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;\r
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter;\r
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;\r
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r