import org.eclipse.core.runtime.IProgressMonitor;\r
import org.eclipse.core.runtime.InvalidRegistryObjectException;\r
import org.eclipse.core.runtime.Platform;\r
-import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;\r
-import org.eclipse.linuxtools.tmf.signal.TmfTraceSelectedSignal;\r
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal;\r
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r
+import org.eclipse.linuxtools.tmf.core.util.TmfTraceType;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomEventsTable;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace;\r
import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace;\r
import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceOpenedSignal;\r
import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceParserUpdatedSignal;\r
import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable;\r
-import org.eclipse.linuxtools.tmf.util.TmfTraceType;\r
import org.eclipse.swt.widgets.Composite;\r
import org.eclipse.swt.widgets.Display;\r
import org.eclipse.ui.IEditorInput;\r