import org.eclipse.jface.viewers.SelectionChangedEvent;\r
import org.eclipse.jface.viewers.StructuredSelection;\r
import org.eclipse.jface.viewers.TreeViewer;\r
-import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
-import org.eclipse.linuxtools.tmf.event.TmfEventType;\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.TmfFilterCompareNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode.Type;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode;\r
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterRootNode;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;\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.TmfFilterCompareNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode;\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.filter.model.TmfFilterOrNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterRootNode;\r
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode.Type;\r
+import org.eclipse.linuxtools.tmf.core.util.TmfTraceType;\r
import org.eclipse.linuxtools.tmf.ui.internal.Messages;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtEvent;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlEvent;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition;\r
-import org.eclipse.linuxtools.tmf.util.TmfTraceType;\r
import org.eclipse.swt.SWT;\r
import org.eclipse.swt.custom.SashForm;\r
import org.eclipse.swt.events.FocusEvent;\r