-import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;\r
-import org.eclipse.linuxtools.tmf.component.TmfComponent;\r
-import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;\r
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;\r
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;\r
-import org.eclipse.linuxtools.tmf.filter.ITmfFilter;\r
-import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode;\r
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;\r
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;\r
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;\r
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;\r
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;\r
-import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;\r
-import org.eclipse.linuxtools.tmf.signal.TmfTraceUpdatedSignal;\r
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;\r
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;\r
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;\r
+import org.eclipse.linuxtools.tmf.core.component.TmfComponent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;\r
+import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterMatchesNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode;\r
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;\r
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;\r
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal;\r
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;\r
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r