diff --git a/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF
index 2e81936c4..38be2341d 100644
--- a/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF
+++ b/analyses/org.eclipse.tracecompass.incubator.inandout.core/META-INF/MANIFEST.MF
@@ -12,8 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.tmf.core,
- org.eclipse.tracecompass.incubator.callstack.core,
- org.eclipse.tracecompass.incubator.analysis.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.analysis.timing.core,
  org.eclipse.tracecompass.segmentstore.core,
diff --git a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java
index 890c02dd0..849bede33 100644
--- a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java
+++ b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisModule.java
@@ -24,7 +24,7 @@
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.incubator.internal.inandout.core.Activator;
 import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
diff --git a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java
index 5a22f81f3..fc8861336 100644
--- a/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java
+++ b/analyses/org.eclipse.tracecompass.incubator.inandout.core/src/org/eclipse/tracecompass/incubator/internal/inandout/core/analysis/InAndOutAnalysisStateProvider.java
@@ -19,8 +19,10 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
 import org.eclipse.tracecompass.incubator.internal.inandout.core.analysis.SegmentSpecifier.SegmentContext;
+import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
+import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
@@ -96,16 +98,16 @@ protected boolean considerEvent(ITmfEvent event) {
     }
 
     @Override
-    protected @Nullable String functionEntry(ITmfEvent event) {
+    protected @Nullable ITmfStateValue functionEntry(ITmfEvent event) {
         SegmentContext segmentContext = fFirst;
         if (segmentContext == null) {
             return null;
         }
-        return segmentContext.getLabel();
+        return TmfStateValue.newValueString(segmentContext.getLabel());
     }
 
     @Override
-    protected @Nullable String functionExit(ITmfEvent event) {
+    protected @Nullable ITmfStateValue functionExit(ITmfEvent event) {
         if (fLast == null) {
             return null;
         }
@@ -116,7 +118,7 @@ protected boolean considerEvent(ITmfEvent event) {
                 map.remove(fLast.getContext(), victim.get());
             }
         }
-        return fLast.getLabel();
+        return TmfStateValue.newValueString(fLast.getLabel());
     }
 
     @Override
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF
index 0bd6fed4b..55df1ad3c 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/META-INF/MANIFEST.MF
@@ -13,10 +13,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
- org.eclipse.tracecompass.incubator.analysis.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.analysis.timing.core,
  org.eclipse.tracecompass.analysis.graph.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.tracecompass.segmentstore.core,
  org.eclipse.tracecompass.datastore.core,
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java
index d263d0705..cebf88ac1 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/callstack/context/ContextCallStackAnalysis.java
@@ -23,12 +23,12 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeGroupDescriptor;
-import org.eclipse.tracecompass.incubator.callstack.core.base.CallStackElement;
-import org.eclipse.tracecompass.incubator.callstack.core.base.CallStackGroupDescriptor;
-import org.eclipse.tracecompass.incubator.callstack.core.base.ICallStackElement;
-import org.eclipse.tracecompass.incubator.callstack.core.sampled.callgraph.ProfilingCallGraphAnalysisModule;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.AggregatedCallSite;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.CallStackGroupDescriptor;
+import org.eclipse.tracecompass.analysis.profiling.core.sampled.callgraph.ProfilingCallGraphAnalysisModule;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java
index 1c78758cd..2e1062e81 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedModule.java
@@ -17,10 +17,10 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.graph.core.criticalpath.AbstractCriticalPathModule;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
 import org.eclipse.tracecompass.tmf.core.TmfStrings;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule;
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java
index d16b4b204..2cd912577 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathAggregatedPalette.java
@@ -16,10 +16,10 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge.EdgeType;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
-import org.eclipse.tracecompass.internal.analysis.graph.core.base.CriticalPathPalette;
+import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
+import org.eclipse.tracecompass.internal.analysis.graph.core.base.OSCriticalPathPalette;
+import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.OSEdgeContextState.OSEdgeContextEnum;
 import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils;
 import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
 import org.eclipse.tracecompass.tmf.core.model.StyleProperties;
@@ -31,7 +31,7 @@
 
 /**
  * The palette for the critical path aggregated. The critical path states will
- * use the {@link CriticalPathPalette} and threads and processes will use a qualitative palette.
+ * use the {@link OSCriticalPathPalette} and threads and processes will use a qualitative palette.
  *
  * @author gbastien
  */
@@ -47,7 +47,7 @@ public class CriticalPathAggregatedPalette implements IDataPalette {
 
     static {
         ImmutableMap.Builder<String, OutputElementStyle> builder = new ImmutableMap.Builder<>();
-        builder.putAll(CriticalPathPalette.getStyles());
+        builder.putAll(OSCriticalPathPalette.getStyles());
         IPaletteProvider palette = new QualitativePaletteProvider.Builder().setNbColors(NUM_COLORS).build();
         int i = 0;
         for (RGBAColor color : palette.get()) {
@@ -85,12 +85,12 @@ public OutputElementStyle getStyleFor(Object object) {
         if (object instanceof WeightedTree) {
             WeightedTree<?> tree = (WeightedTree<?>) object;
             Object treeObject = tree.getObject();
-            if (treeObject instanceof EdgeType) {
-                return STYLE_MAP.computeIfAbsent(((EdgeType) treeObject).name(), style -> new OutputElementStyle(style));
+            if (treeObject instanceof OSEdgeContextEnum) {
+                return STYLE_MAP.computeIfAbsent(((OSEdgeContextEnum) treeObject).name(), OutputElementStyle::new);
             }
-            return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(treeObject.hashCode(), NUM_COLORS)), style -> new OutputElementStyle(style));
+            return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(treeObject.hashCode(), NUM_COLORS)), OutputElementStyle::new);
         }
-        return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(object.hashCode(), NUM_COLORS)), style -> new OutputElementStyle(style));
+        return STYLE_MAP.computeIfAbsent(DEFAULT_PREFIX + String.valueOf(Math.floorMod(object.hashCode(), NUM_COLORS)), OutputElementStyle::new);
     }
 
     @Override
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java
index da4be3cf0..d836fdfb2 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/criticalpath/CriticalPathWeighted.java
@@ -24,8 +24,8 @@
 import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex;
 import org.eclipse.tracecompass.analysis.graph.core.graph.TmfEdgeState;
 import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
 
 import com.google.common.collect.ImmutableList;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java
index 4050e4e6a..d9bfb40d9 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/fileaccess/FileAccessDataProvider.java
@@ -32,10 +32,10 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
 import org.eclipse.tracecompass.incubator.internal.kernel.core.fileaccess.FileEntryModel.Type;
 import org.eclipse.tracecompass.incubator.internal.kernel.core.io.IoAnalysis;
 import org.eclipse.tracecompass.incubator.internal.kernel.core.io.IoStateProvider;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java
index d8341d98c..15f10903a 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.core/src/org/eclipse/tracecompass/incubator/internal/kernel/core/io/IoPerProcessDataProvider.java
@@ -29,10 +29,10 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.OsStrings;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.Disk;
 import org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.IODataPalette;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.internal.tmf.core.model.TmfXyResponseFactory;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
diff --git a/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF
index e3327de06..1bbbae749 100644
--- a/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF
+++ b/analyses/org.eclipse.tracecompass.incubator.kernel.ui/META-INF/MANIFEST.MF
@@ -18,11 +18,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.analysis.os.linux.ui,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
- org.eclipse.tracecompass.incubator.analysis.core,
- org.eclipse.tracecompass.incubator.callstack.core,
- org.eclipse.tracecompass.incubator.callstack.ui,
  org.eclipse.tracecompass.analysis.timing.ui,
  org.eclipse.tracecompass.analysis.timing.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
+ org.eclipse.tracecompass.analysis.profiling.ui,
  org.eclipse.tracecompass.segmentstore.core,
  org.eclipse.tracecompass.datastore.core,
  org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui
diff --git a/analyses/org.eclipse.tracecompass.incubator.rocm.core/.settings/org.eclipse.jdt.core.prefs b/analyses/org.eclipse.tracecompass.incubator.rocm.core/.settings/org.eclipse.jdt.core.prefs
index 9b22a6801..fa19fabd9 100644
--- a/analyses/org.eclipse.tracecompass.incubator.rocm.core/.settings/org.eclipse.jdt.core.prefs
+++ b/analyses/org.eclipse.tracecompass.incubator.rocm.core/.settings/org.eclipse.jdt.core.prefs
@@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
 org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/.settings/org.eclipse.jdt.core.prefs b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/.settings/org.eclipse.jdt.core.prefs
index 0482be35b..22abfa08e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -29,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
 org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF
index 5679a1a03..6f4589201 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF
@@ -20,7 +20,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.lttng2.kernel.core.tests,
  org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf,
  org.eclipse.tracecompass.analysis.timing.core,
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.tracecompass.analysis.profiling.core,
+ org.eclipse.tracecompass.analysis.profiling.core.tests
 Export-Package: org.eclipse.tracecompass.incubator.analysis.core.tests,
  org.eclipse.tracecompass.incubator.analysis.core.tests.aspects,
  org.eclipse.tracecompass.incubator.analysis.core.tests.model,
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java
index 2c8adc0c1..cc62cf764 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
 import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree;
 import org.eclipse.tracecompass.incubator.internal.analysis.core.weighted.tree.DifferentialPalette;
 import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java
similarity index 97%
rename from callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java
rename to callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java
index 540381d21..a5a7bb10d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.analysis.core.tests.weighted;
+package org.eclipse.tracecompass.incubator.analysis.core.tests.weighted.diff;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,16 +24,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.tests.stubs.weighted.SimpleTree;
-import org.eclipse.tracecompass.incubator.analysis.core.tests.stubs.weighted.WeightedTreeProviderStub;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.ITree;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeSet;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils;
+import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs.weighted.SimpleTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs.weighted.WeightedTreeProviderStub;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeSet;
 import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree;
 import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider;
+import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.WeightedTreeUtils;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF
index aa8160260..4f2281a78 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.analysis.timing.core,
  org.eclipse.tracecompass.segmentstore.core,
  org.eclipse.tracecompass.datastore.core,
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.tracecompass.analysis.profiling.core
 Export-Package: org.eclipse.tracecompass.incubator.analysis.core.aspects,
  org.eclipse.tracecompass.incubator.analysis.core.concepts,
  org.eclipse.tracecompass.incubator.analysis.core.model,
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java
index 5ec20fa81..57ea9e9c3 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java
@@ -14,8 +14,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java
index c1ac03f98..7ebad83dc 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java
@@ -14,8 +14,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java
index 835e72860..8ae63342b 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java
@@ -14,8 +14,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java
index b4b45c036..015b97b9f 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java
@@ -14,8 +14,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
index 625ac7bd7..2ead8e053 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
@@ -27,6 +27,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class AggregatedCallSite extends WeightedTree<ICallStackSymbol> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
index ba61b7666..cff647642 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
@@ -18,6 +18,7 @@
 /**
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ICallStackSymbol {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java
index 6ea349a32..b1b4f051e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java
@@ -23,6 +23,7 @@
  * NOTE to developers: this interface is used with the composite host model but
  * won't be necessary anymore once the analyses populate the model directly.
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ICpuTimeProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java
index 40e710c31..a2850e6c1 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java
@@ -18,6 +18,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ISamplingDataProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java
index b464d20dc..619d9af94 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java
@@ -22,6 +22,7 @@
  * NOTE to developers: this interface is used with the composite host model but
  * won't be necessary anymore once the analyses populate the model directly.
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IThreadOnCpuProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java
index d0fc62006..c11348f65 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java
@@ -19,6 +19,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class ProcessStatusInterval implements ISegment {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java
index b94243577..4fbcd177a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java
@@ -34,6 +34,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IHostModel {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java
index e8e9645a1..8e4d8553a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public final class ModelManager {
 
     private static final Map<String, IHostModel> MODELS_FOR_HOST = new HashMap<>();
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java
index 3918956e9..f93b9218a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java
@@ -18,6 +18,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public final class AllGroupDescriptor implements IWeightedTreeGroupDescriptor {
 
     private static final String ALL_NAME = "all"; //$NON-NLS-1$
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java
index 6a09550ba..f1bfdf124 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class DepthGroupDescriptor implements IWeightedTreeGroupDescriptor {
 
     private final int fDepth;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java
index 61abc5a02..806c5bc84 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IDataPalette {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java
index f37a42467..96ddef442 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ITree {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java
index cc8e77f25..1b615679b 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java
@@ -49,6 +49,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IWeightedTreeGroupDescriptor {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java
index 5696b6d6a..4cc048c52 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java
@@ -48,6 +48,7 @@
  * @param <T>
  *            The type of the tree provided
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IWeightedTreeProvider<@NonNull N, E, @NonNull T extends WeightedTree<N>> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java
index 8f80a2b23..197b6f5fd 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java
@@ -36,6 +36,7 @@
  * @param <T>
  *            The type of the tree provided
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IWeightedTreeSet<@NonNull N, E, @NonNull T extends WeightedTree<N>> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java
index 65071b95c..54037200a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java
@@ -37,6 +37,7 @@
  * @param <T>
  *            The type of objects in this tree
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class WeightedTree<@NonNull T> implements Comparable<WeightedTree<T>> {
 
     private final T fObject;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java
index d8acea38c..5a332b34f 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public final class WeightedTreeGroupBy {
 
     private WeightedTreeGroupBy() {
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java
index e172c14d9..ef1dc27d5 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java
@@ -32,6 +32,7 @@
  *            {@link ITree}, then the elements and their associated weighted
  *            trees will be grouped in a hierarchical style
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class WeightedTreeSet<@NonNull N, E> implements IWeightedTreeSet<N, E, WeightedTree<N>> {
 
     private final Set<E> fRootElements = new HashSet<>();
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java
index 73088bfb6..b9ed3733e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java
@@ -12,7 +12,7 @@
 package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
 
 /**
  * A class that represents a differential weighted tree. The weight is the base
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java
index 637d976fc..06dd36400 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java
@@ -22,10 +22,10 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
 import org.eclipse.tracecompass.incubator.internal.analysis.core.weighted.tree.DifferentialPalette;
 
 /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java
index 72f6315d6..469f87cb3 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java
@@ -17,8 +17,8 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.ITree;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java
similarity index 96%
rename from callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java
rename to callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java
index a279c77ab..91afdc798 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree;
+package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -18,9 +18,10 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
 import org.eclipse.tracecompass.tmf.core.util.Pair;
 
 import com.google.common.collect.ImmutableList;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java
index 307c471d5..977991623 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
+import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette;
 import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree;
 import org.eclipse.tracecompass.incubator.internal.analysis.core.Activator;
 import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/.settings/org.eclipse.jdt.core.prefs b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/.settings/org.eclipse.jdt.core.prefs
index 0482be35b..22abfa08e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -29,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
 org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/META-INF/MANIFEST.MF
index 33088b6e0..b5482941d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/META-INF/MANIFEST.MF
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/META-INF/MANIFEST.MF
@@ -41,7 +41,6 @@ Export-Package: org.eclipse.tracecompass.incubator.callstack.core.tests,
  org.eclipse.tracecompass.incubator.callstack.core.tests.lttng2.ust.callstack,
  org.eclipse.tracecompass.incubator.callstack.core.tests.perf.analysis,
  org.eclipse.tracecompass.incubator.callstack.core.tests.sampled,
- org.eclipse.tracecompass.incubator.callstack.core.tests.stubs,
- org.eclipse.tracecompass.incubator.callstack.core.tests.xml.module
+ org.eclipse.tracecompass.incubator.callstack.core.tests.stubs
 Import-Package: com.google.common.collect
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.callstack.core.tests
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/build.properties b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/build.properties
index f1ad88eb3..968671172 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/build.properties
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/build.properties
@@ -18,5 +18,4 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
                plugin.xml,\
-               test_xml_files/,\
                testfiles/
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/flamechart/FlameChartDataProviderTest.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/flamechart/FlameChartDataProviderTest.java
index e7ce4c1b0..b837be21a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/flamechart/FlameChartDataProviderTest.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/flamechart/FlameChartDataProviderTest.java
@@ -77,7 +77,7 @@ private FlameChartDataProvider getDataProvider() {
     public void testGetDescriptors() {
         FlameChartDataProviderFactory dataProviderFactory = new FlameChartDataProviderFactory();
         Collection<IDataProviderDescriptor> descriptors = dataProviderFactory.getDescriptors(getTrace());
-        assertEquals(descriptors.size(), 2);
+        assertEquals(1, descriptors.size());
 
         for (IDataProviderDescriptor descriptor : descriptors) {
             switch(descriptor.getId()) {
@@ -86,11 +86,6 @@ public void testGetDescriptors() {
                 assertEquals(IDataProviderDescriptor.ProviderType.TIME_GRAPH, descriptor.getType());
                 assertEquals("Show FlameChart provided by Analysis module: Test Callstack", descriptor.getDescription());
                 break;
-            case "org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.provider.flamechart:callstack.analysis":
-                assertEquals("FlameChart Test XML callstack", descriptor.getName());
-                assertEquals(IDataProviderDescriptor.ProviderType.TIME_GRAPH, descriptor.getType());
-                assertEquals("Show FlameChart provided by Analysis module: Test XML callstack", descriptor.getDescription());
-                break;
             default:
                 fail("Unknown Entry" + descriptor.getId());
                 break;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/xml/module/XmlCallstackTest.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/xml/module/XmlCallstackTest.java
deleted file mode 100644
index e90db3eef..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/src/org/eclipse/tracecompass/incubator/callstack/core/tests/xml/module/XmlCallstackTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-package org.eclipse.tracecompass.incubator.callstack.core.tests.xml.module;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider.DataType;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider.MetricType;
-import org.eclipse.tracecompass.incubator.callstack.core.tests.Activator;
-import org.eclipse.tracecompass.incubator.callstack.core.tests.flamechart.CallStackTestBase;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.palette.FlameWithKernelPalette;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack.CallstackXmlAnalysis;
-import org.eclipse.tracecompass.internal.tmf.analysis.xml.core.module.XmlUtils;
-import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
-import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
-import org.junit.Test;
-
-/**
- * Test the XML callstack analysis
- *
- * @author Geneviève Bastien
- */
-@SuppressWarnings("restriction")
-public class XmlCallstackTest extends CallStackTestBase {
-
-    private static final String XML_FILE_NAME = "test_callstack.xml";
-    private static final @NonNull String XML_MODULE_ID = "callstack.analysis";
-    private static final String XML_FILE = "test_xml_files/" + XML_FILE_NAME;
-
-    private CallstackXmlAnalysis fXmlModule;
-
-    @Override
-    public void setUp() {
-        // Add the XML file
-        IPath absoluteFilePath = Activator.getAbsoluteFilePath(XML_FILE);
-        File file = absoluteFilePath.toFile();
-        IStatus xmlFile = XmlUtils.addXmlFile(file);
-        assertTrue(xmlFile.isOK());
-        super.setUp();
-
-        ITmfTrace trace = getTrace();
-        CallstackXmlAnalysis module = TmfTraceUtils.getAnalysisModuleOfClass(trace, CallstackXmlAnalysis.class, XML_MODULE_ID);
-        assertNotNull(module);
-
-        module.schedule();
-        assertTrue(module.waitForCompletion());
-        fXmlModule = module;
-    }
-
-    @Override
-    public void tearDown() {
-        super.tearDown();
-        // Remote the XML file
-        XmlUtils.deleteFiles(Collections.singleton(XML_FILE_NAME));
-
-    }
-
-    /**
-     * Test the weighted tree configuration of the XML callstack
-     */
-    @Test
-    public void testCallstackWeightedTree() {
-        CallstackXmlAnalysis xmlModule = fXmlModule;
-        assertNotNull(xmlModule);
-
-        MetricType weightType = xmlModule.getWeightType();
-        assertEquals(DataType.NANOSECONDS, weightType.getDataType());
-
-        List<@NonNull MetricType> additionalMetrics = xmlModule.getAdditionalMetrics();
-        assertFalse(additionalMetrics.isEmpty());
-
-        IDataPalette palette = xmlModule.getPalette();
-        assertEquals(FlameWithKernelPalette.getInstance(), palette);
-    }
-
-}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/test_xml_files/test_callstack.xml b/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/test_xml_files/test_callstack.xml
deleted file mode 100644
index 1bf8a9424..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core.tests/test_xml_files/test_callstack.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tmfxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="xmlDefinition.xsd">
-<!-- ***************************************************************************
-* Copyright (c) 2017 École Polytechnique de Montréal
-*
-* All rights reserved. This program and the accompanying materials are
-* made available under the terms of the Eclipse Public License 2.0 which
-* accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/*\1 SPDX-License-Identifier: EPL-2.0
-*************************************************************************** -->
-<callstack id="callstack.analysis">
-	<callstackGroup>
-		<level path="threads/*"/>
-	</callstackGroup>
-
-	<pattern version="0" id="callstack.pattern">
-		<head>
-			<traceType id="org.eclipse.linuxtools.tmf.core.tests.xmlstub" />
-			<label value="Test XML callstack" />
-		</head>
-
-		<patternHandler>
-
-			<action id="functionEntry">
-				<stateChange>
-					<stateAttribute type="constant" value="threads" />
-					<stateAttribute type="eventField" value="tid" />
-					<stateAttribute type="constant" value="CallStack" />
-					<stateValue type="eventField" value="op" stack="push"/>
-				</stateChange>
-			</action>
-
-			<action id="functionExit">
-				<stateChange>
-					<stateAttribute type="constant" value="threads" />
-					<stateAttribute type="eventField" value="tid" />
-					<stateAttribute type="constant" value="CallStack" />
-					<stateValue type="eventField" value="op" stack="pop"/>
-				</stateChange>
-			</action>
-
-			<fsm id="callstack" multiple="false" initial="oneState">
-				<state id="oneState">
-					<transition event="entry" target="oneState" action="functionEntry"/>
-					<transition event="exit" target="oneState" action="functionExit"/>
-				</state>
-			</fsm>
-
-		</patternHandler>
-	</pattern>
-</callstack>
-
-<timeGraphView id="callstack.pattern.tgview">
-	<head>
-		<analysis id="callstack.analysis" />
-		<label value="XML Callstack SS view" />
-	</head>
-	<!-- StateValues -->
-
-	<!-- Control Flow View -->
-	<entry path="threads/*">
-		<display type="self" />
-		<entry path="callstack/*">
-			<display type="self" />
-		</entry>
-	</entry>
-</timeGraphView>
-</tmfxml>
\ No newline at end of file
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.callstack.core/META-INF/MANIFEST.MF
index 2755a6a6a..39bbb9d2d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/META-INF/MANIFEST.MF
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/META-INF/MANIFEST.MF
@@ -39,8 +39,7 @@ Export-Package: org.eclipse.tracecompass.incubator.callstack.core.base,
  org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.callgraph;x-friends:="org.eclipse.tracecompass.incubator.callstack.core.tests,org.eclipse.tracecompass.incubator.callstack.ui",
  org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.provider,
  org.eclipse.tracecompass.incubator.internal.callstack.core.palette,
- org.eclipse.tracecompass.incubator.internal.callstack.core.symbol;x-internal:=true,
- org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack;x-friends:="org.eclipse.tracecompass.incubator.callstack.core.tests,org.eclipse.tracecompass.incubator.callstack.ui"
+ org.eclipse.tracecompass.incubator.internal.callstack.core.symbol;x-internal:=true
 Import-Package: com.google.common.annotations,
  com.google.common.base,
  com.google.common.cache,
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/build.properties b/callstack/org.eclipse.tracecompass.incubator.callstack.core/build.properties
index 2fc32c78a..9e23af68b 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/build.properties
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/build.properties
@@ -14,6 +14,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
-               xsd_files/,\
                .,\
                plugin.xml
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/plugin.xml b/callstack/org.eclipse.tracecompass.incubator.callstack.core/plugin.xml
index 12e721238..d4289ee74 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/plugin.xml
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/plugin.xml
@@ -3,12 +3,6 @@
 <plugin>
    <extension
          point="org.eclipse.tracecompass.tmf.analysis.xml.core.xsd">
-      <xsdfile
-            file="xsd_files/xmlCallstack.xsd">
-      </xsdfile>
-      <schemaParser
-            class="org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack.CallstackXmlSchemaParser">
-      </schemaParser>
    </extension>
    <extension
          point="org.eclipse.linuxtools.tmf.core.analysis">
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java
index 47b7bb0ae..34a2b0c25 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java
@@ -24,6 +24,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class CallStackElement implements ICallStackElement {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java
index c7908cf25..530d8e3bc 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java
@@ -18,6 +18,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class CallStackGroupDescriptor implements ICallStackGroupDescriptor {
 
     private final String fName;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java
index 22894e542..197d21911 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java
@@ -30,6 +30,7 @@
  *
  * @author Loic Prieur-Drevon
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class EdgeStateValue extends CustomStateValue {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java
index 98515797c..2d5b3d541 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java
@@ -28,6 +28,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ICallStackElement extends ITree {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java
index a69a700ea..4e6887632 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java
@@ -59,6 +59,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ICallStackGroupDescriptor extends IWeightedTreeGroupDescriptor {
 
     @Override
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java
index 2589aa122..61d233a28 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java
@@ -33,6 +33,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class CallGraph implements IWeightedTreeSet<@NonNull ICallStackSymbol, ICallStackElement, AggregatedCallSite> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java
index cee168f91..1e7c1bc5e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java
@@ -32,6 +32,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ICallGraphProvider extends IWeightedTreeProvider<@NonNull ICallStackSymbol, ICallStackElement, AggregatedCallSite> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java
index b61712b2e..1466f1aa0 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java
@@ -31,6 +31,7 @@
  *
  * @author Sonia Farrah
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public final class SymbolAspect implements ISegmentAspect {
     /**
      * A symbol aspect
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java
index 00e4d3a6f..6f36963c7 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java
@@ -48,6 +48,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class CallStack {
 
     private final @Nullable ICallStackElement fSymbolKeyElement;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java
index 3ed24750c..a9546c9d4 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IEventCallStackProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java
index 1ff70548d..a9f6c37d2 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class CallStackDepth {
 
     private final CallStack fCallstack;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java
index 10c452536..9dfa8c80e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java
@@ -22,6 +22,7 @@
  * @author Matthew Khouzam
  * @author Sonia Farrah
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface ICalledFunction extends INamedSegment {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java
index 788886f88..91d4d8231 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java
@@ -30,6 +30,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public interface IFlameChartProvider extends IAnalysisModule, ISegmentStoreProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java
index c7c7ef7f5..58256a9f2 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java
@@ -32,6 +32,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public final class CallStackHostUtils {
 
     private CallStackHostUtils() {
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java
index 646a225be..119d5b4f4 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java
@@ -98,6 +98,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class CallStackSeries implements ISegmentStore<ISegment> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
index cbfe2d3bf..30216069a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
@@ -84,6 +84,7 @@
  *
  * @author Patrick Tasse
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public abstract class CallStackStateProvider extends AbstractTmfStateProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java
index 26bb40687..5e6a7ef8b 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java
@@ -58,6 +58,7 @@
  * @author Matthew Khouzam
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public abstract class InstrumentedCallStackAnalysis extends TmfStateSystemAnalysisModule implements IFlameChartProvider, ICallGraphProvider {
 
     /** CallStack stack-attribute */
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
index 405c7825f..30425091d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
@@ -39,6 +39,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 @SuppressWarnings("restriction")
 public class LttngUstCallStackAnalysis extends InstrumentedCallStackAnalysis {
 
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java
index 8f8bc8ec8..525418347 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java
@@ -29,6 +29,7 @@
  * @author Bernd Hufmann
  *
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 @SuppressWarnings("restriction")
 public class LttngUstCallStackAnalysisRequirement extends TmfCompositeAnalysisRequirement {
 
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java
index beba606e0..f21330c54 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public class AggregatedStackTraces extends AggregatedCallSite {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java
index 493da0438..4d7ef8c0e 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java
@@ -47,6 +47,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public abstract class ProfilingCallGraphAnalysisModule extends TmfAbstractAnalysisModule implements ICallGraphProvider, IEventCallStackProvider {
 
     private static final MetricType WEIGHT_METRIC = new MetricType(Objects.requireNonNull(Messages.CallGraphStats_NbCalls), DataType.NUMBER, null);
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java
index ba6b073d8..34e117ec8 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java
@@ -23,6 +23,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="0.10.0", forRemoval=true)
 public final class CallStackSymbolFactory {
 
     private static final Pattern IS_NUMBER = Pattern.compile("[0-9A-Fa-f]+");
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlAnalysis.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlAnalysis.java
deleted file mode 100644
index ce01f63f6..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlAnalysis.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-package org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.analysis.timing.core.segmentstore.IAnalysisProgressListener;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeGroupDescriptor;
-import org.eclipse.tracecompass.incubator.callstack.core.callgraph.CallGraph;
-import org.eclipse.tracecompass.incubator.callstack.core.callgraph.ICallGraphProvider;
-import org.eclipse.tracecompass.incubator.callstack.core.callgraph.SymbolAspect;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.IFlameChartProvider;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils.IHostIdResolver;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdResolver;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.Activator;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.FunctionTidAspect;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.callgraph.CallGraphAnalysis;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack.CallstackXmlModuleHelper.ISubModuleHelper;
-import org.eclipse.tracecompass.segmentstore.core.ISegment;
-import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
-import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
-import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfXmlStrings;
-import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfXmlUtils;
-import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
-import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule;
-import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
-import org.eclipse.tracecompass.tmf.core.segment.ISegmentAspect;
-import org.eclipse.tracecompass.tmf.core.statesystem.ITmfAnalysisModuleWithStateSystems;
-import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
-import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
-import org.w3c.dom.Element;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- *
- *
- * @author Geneviève Bastien
- */
-public class CallstackXmlAnalysis extends TmfAbstractAnalysisModule implements IFlameChartProvider, ITmfAnalysisModuleWithStateSystems, ICallGraphProvider {
-
-    private final Path fSourceFile;
-    private final ISubModuleHelper fHelper;
-    private @Nullable IAnalysisModule fModule = null;
-    private @Nullable CallStackSeries fCallStacks = null;
-    private final CallGraphAnalysis fCallGraph;
-    private boolean fHasTid = false;
-
-    private final ListenerList fListeners = new ListenerList(ListenerList.IDENTITY);
-
-    /**
-     * Constructor
-     *
-     * @param sourceFile
-     *            The source file containing this callstack analysis
-     * @param helper
-     *            The helper for the dependent module
-     */
-    public CallstackXmlAnalysis(Path sourceFile, ISubModuleHelper helper) {
-        super();
-        fSourceFile = sourceFile;
-        fHelper = helper;
-        fCallGraph = new CallGraphAnalysis(this);
-    }
-
-    @Override
-    public @Nullable CallStackSeries getCallStackSeries() {
-        CallStackSeries series = fCallStacks;
-        if (series == null) {
-            IAnalysisModule module = getAnalysisModule();
-            if (!(module instanceof ITmfAnalysisModuleWithStateSystems)) {
-                return null;
-            }
-            Iterator<@NonNull ITmfStateSystem> stateSystems = ((ITmfAnalysisModuleWithStateSystems) module).getStateSystems().iterator();
-            if (!stateSystems.hasNext()) {
-                return null;
-            }
-            ITmfStateSystem ss = stateSystems.next();
-            Path xmlFile = fSourceFile;
-            final String pathString = xmlFile.toString();
-            Element doc = TmfXmlUtils.getElementInFile(pathString, CallstackXmlStrings.CALLSTACK, getId());
-            if (doc == null) {
-                fCallStacks = null;
-                return null;
-            }
-
-            /* parser for defined Fields */
-            List<Element> callStackElements = TmfXmlUtils.getChildElements(doc, CallstackXmlStrings.CALLSTACK_GROUP);
-            if (callStackElements.size() > 1) {
-                Activator.getInstance().logWarning("More than one callstack series defined. Only the first one will be displayed"); //$NON-NLS-1$
-            } else if (callStackElements.isEmpty()) {
-                fCallStacks = null;
-                return null;
-            }
-            Element callStackElement = callStackElements.get(0);
-
-            List<String[]> patterns = new ArrayList<>();
-            for (Element child : TmfXmlUtils.getChildElements(callStackElement, CallstackXmlStrings.CALLSTACK_LEVEL)) {
-                String attribute = child.getAttribute(CallstackXmlStrings.CALLSTACK_PATH);
-                patterns.add(attribute.split("/")); //$NON-NLS-1$
-            }
-
-            // Build the thread resolver
-            List<Element> childElements = TmfXmlUtils.getChildElements(callStackElement, CallstackXmlStrings.CALLSTACK_THREAD);
-            IThreadIdResolver resolver = null;
-            if (childElements.size() > 0) {
-                Element threadElement = childElements.get(0);
-                String attribute = threadElement.getAttribute(CallstackXmlStrings.CALLSTACK_THREADCPU);
-                if (!attribute.isEmpty()) {
-                    resolver = new CallStackSeries.CpuResolver(attribute.split("/")); //$NON-NLS-1$
-                } else {
-                    attribute = threadElement.getAttribute(CallstackXmlStrings.CALLSTACK_THREADLEVEL);
-                    if (!attribute.isEmpty()) {
-                        String type = threadElement.getAttribute(CallstackXmlStrings.CALLSTACK_THREADLEVEL_TYPE);
-                        if (type.equals(CallstackXmlStrings.CALLSTACK_THREADLEVEL_VALUE)) {
-                            resolver = new CallStackSeries.AttributeValueThreadResolver(Integer.valueOf(attribute));
-                        } else {
-                            resolver = new CallStackSeries.AttributeNameThreadResolver(Integer.valueOf(attribute));
-                        }
-                    }
-                }
-            }
-            fHasTid = (resolver != null);
-
-            // Build the host resolver
-            childElements = TmfXmlUtils.getChildElements(callStackElement, CallstackXmlStrings.CALLSTACK_HOST);
-            IHostIdResolver hostResolver = null;
-            if (childElements.size() > 0) {
-                Element hostElement = childElements.get(0);
-                String attribute = hostElement.getAttribute(CallstackXmlStrings.CALLSTACK_THREADLEVEL);
-                if (!attribute.isEmpty()) {
-                    String type = hostElement.getAttribute(CallstackXmlStrings.CALLSTACK_THREADLEVEL_TYPE);
-                    if (type.equals(CallstackXmlStrings.CALLSTACK_THREADLEVEL_VALUE)) {
-                        hostResolver = new CallStackHostUtils.AttributeValueHostResolver(Integer.valueOf(attribute));
-                    } else {
-                        hostResolver = new CallStackHostUtils.AttributeNameHostResolver(Integer.valueOf(attribute));
-                    }
-                }
-            }
-            hostResolver = hostResolver == null ? new CallStackHostUtils.TraceHostIdResolver(Objects.requireNonNull(getTrace())) : hostResolver;
-            fHasTid = resolver != null;
-            series = new CallStackSeries(ss, patterns, 0, callStackElement.getAttribute(TmfXmlStrings.NAME), hostResolver, resolver);
-            fCallStacks = series;
-        }
-        return series;
-    }
-
-    @Override
-    public String getHostId() {
-        ITmfTrace trace = getTrace();
-        if (trace == null) {
-            return ""; //$NON-NLS-1$
-        }
-        return trace.getHostId();
-    }
-
-    @Override
-    protected boolean executeAnalysis(IProgressMonitor monitor) throws TmfAnalysisException {
-        IAnalysisModule analysisModule = getAnalysisModule();
-        if (analysisModule == null) {
-            return false;
-        }
-        boolean ret = analysisModule.waitForCompletion(monitor);
-        if (!ret) {
-            return ret;
-        }
-        ISegmentStore<ISegment> segmentStore = getSegmentStore();
-        if (segmentStore != null) {
-            sendUpdate(segmentStore);
-        }
-        fCallGraph.schedule();
-        return true;
-    }
-
-    @Override
-    protected void canceling() {
-        IAnalysisModule analysisModule = getAnalysisModule();
-        if (analysisModule != null) {
-            analysisModule.cancel();
-        }
-        fCallGraph.cancel();
-    }
-
-    @Override
-    public void dispose() {
-        /*
-         * The sub-analyses are not registered to the trace directly, so we need
-         * to tell them when the trace is disposed.
-         */
-        super.dispose();
-        IAnalysisModule analysisModule = getAnalysisModule();
-        if (analysisModule != null) {
-            analysisModule.dispose();
-        }
-        fCallGraph.dispose();
-    }
-
-    @Override
-    public boolean setTrace(@NonNull ITmfTrace trace) throws TmfAnalysisException {
-        if (!super.setTrace(trace)) {
-            return false;
-        }
-        return fCallGraph.setTrace(trace);
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
-        fCallGraph.setName(name);
-    }
-
-    @Override
-    protected Iterable<IAnalysisModule> getDependentAnalyses() {
-        ITmfTrace trace = getTrace();
-        if (trace == null) {
-            throw new NullPointerException("Trace should not be null at this point"); //$NON-NLS-1$
-        }
-        IAnalysisModule module = getAnalysisModule();
-
-        if (module == null) {
-            return Collections.emptyList();
-        }
-        return Collections.singleton(module);
-
-    }
-
-    private synchronized @Nullable IAnalysisModule getAnalysisModule() {
-        IAnalysisModule module = fModule;
-        if (module == null) {
-            ITmfTrace trace = getTrace();
-            if (trace == null) {
-                return null;
-            }
-            module = fHelper.getAnalysis(trace);
-            if (module != null) {
-                fModule = module;
-            }
-        }
-        return module;
-    }
-
-    @Override
-    public @Nullable ITmfStateSystem getStateSystem(String id) {
-        IAnalysisModule analysisModule = getAnalysisModule();
-        if (analysisModule instanceof ITmfAnalysisModuleWithStateSystems) {
-            return ((ITmfAnalysisModuleWithStateSystems) analysisModule).getStateSystem(id);
-        }
-        return null;
-    }
-
-    @Override
-    public Iterable<ITmfStateSystem> getStateSystems() {
-        IAnalysisModule analysisModule = getAnalysisModule();
-        if (analysisModule instanceof ITmfAnalysisModuleWithStateSystems) {
-            return ((ITmfAnalysisModuleWithStateSystems) analysisModule).getStateSystems();
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    public boolean waitForInitialization() {
-        IAnalysisModule analysisModule = getAnalysisModule();
-        if (analysisModule instanceof ITmfAnalysisModuleWithStateSystems) {
-            return ((ITmfAnalysisModuleWithStateSystems) analysisModule).waitForInitialization();
-        }
-        return false;
-    }
-
-    @Override
-    public Collection<IWeightedTreeGroupDescriptor> getGroupDescriptors() {
-        fCallGraph.schedule();
-        fCallGraph.waitForCompletion();
-        return fCallGraph.getGroupDescriptors();
-    }
-
-    @Override
-    public CallGraph getCallGraph(ITmfTimestamp start, ITmfTimestamp end) {
-        fCallGraph.schedule();
-        fCallGraph.waitForCompletion();
-        return fCallGraph.getCallGraph(start, end);
-    }
-
-    @Override
-    public CallGraph getCallGraph() {
-        fCallGraph.schedule();
-        fCallGraph.waitForCompletion();
-        return fCallGraph.getCallGraph();
-    }
-
-    @Override
-    public AggregatedCallSite createCallSite(Object symbol) {
-        return fCallGraph.createCallSite(symbol);
-    }
-
-    @Override
-    public String getTitle() {
-        return fCallGraph.getTitle();
-    }
-
-    @Override
-    public void addListener(@NonNull IAnalysisProgressListener listener) {
-        fListeners.add(listener);
-    }
-
-    @Override
-    public void removeListener(@NonNull IAnalysisProgressListener listener) {
-        fListeners.remove(listener);
-    }
-
-    @Override
-    public Iterable<ISegmentAspect> getSegmentAspects() {
-        if (fHasTid) {
-            return ImmutableList.of(FunctionTidAspect.TID_ASPECT, SymbolAspect.SYMBOL_ASPECT);
-        }
-        return Collections.singletonList(SymbolAspect.SYMBOL_ASPECT);
-    }
-
-    @Override
-    public @Nullable ISegmentStore<ISegment> getSegmentStore() {
-        CallStackSeries series = getCallStackSeries();
-        if (series == null) {
-            return null;
-        }
-        return series;
-    }
-
-    /**
-     * Returns all the listeners
-     *
-     * @return latency listeners
-     */
-    protected Iterable<IAnalysisProgressListener> getListeners() {
-        List<IAnalysisProgressListener> listeners = new ArrayList<>();
-        for (Object listener : fListeners.getListeners()) {
-            if (listener != null) {
-                listeners.add((IAnalysisProgressListener) listener);
-            }
-        }
-        return listeners;
-    }
-
-    /**
-     * Send the segment store to all its listener
-     *
-     * @param store
-     *            The segment store to broadcast
-     */
-    protected void sendUpdate(final ISegmentStore<ISegment> store) {
-        for (IAnalysisProgressListener listener : getListeners()) {
-            listener.onComplete(this, store);
-        }
-    }
-
-    @Override
-    public boolean isComplete() {
-        // Initialization error, but the analysis is completed
-        if (!waitForInitialization()) {
-            return true;
-        }
-        Iterator<ITmfStateSystem> iterator = getStateSystems().iterator();
-        if (!iterator.hasNext()) {
-            throw new IllegalStateException("The initialization is complete, so the state system must not be null"); //$NON-NLS-1$
-        }
-        return iterator.next().waitUntilBuilt(0);
-    }
-
-    @Override
-    public long getEnd() {
-        // Initialization error, but the analysis is completed
-        if (!waitForInitialization()) {
-            return Integer.MIN_VALUE;
-        }
-        Iterator<ITmfStateSystem> iterator = getStateSystems().iterator();
-        if (!iterator.hasNext()) {
-            throw new IllegalStateException("The initialization is complete, so the state system must not be null"); //$NON-NLS-1$
-        }
-        return iterator.next().getCurrentEndTime();
-    }
-
-    @Override
-    public List<String> getExtraDataSets() {
-        return fCallGraph.getExtraDataSets();
-    }
-
-    @Override
-    public MetricType getWeightType() {
-        return fCallGraph.getWeightType();
-    }
-
-    @Override
-    public List<MetricType> getAdditionalMetrics() {
-        return fCallGraph.getAdditionalMetrics();
-    }
-
-    @Override
-    public String toDisplayString(AggregatedCallSite object) {
-        return fCallGraph.toDisplayString(object);
-    }
-
-    @Override
-    public Object getAdditionalMetric(AggregatedCallSite object, int metricIndex) {
-        return fCallGraph.getAdditionalMetric(object, metricIndex);
-    }
-
-    @Override
-    public IDataPalette getPalette() {
-        fCallGraph.schedule();
-        fCallGraph.waitForCompletion();
-        return fCallGraph.getPalette();
-    }
-
-}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlModuleHelper.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlModuleHelper.java
deleted file mode 100644
index d1081ddb4..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlModuleHelper.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-package org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.Activator;
-import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfAnalysisModuleHelperXml;
-import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfXmlStrings;
-import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfXmlUtils;
-import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
-import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModuleHelper;
-import org.eclipse.tracecompass.tmf.core.analysis.TmfAnalysisManager;
-import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
-import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
-import org.w3c.dom.Element;
-
-import com.google.common.collect.Multimap;
-
-/**
- * An XML module helper for the callstack modules. It overrides some methods to
- * use the trace type that applies as well as labels from the module that
- * creates the state system.
- *
- * @author Geneviève Bastien
- */
-public class CallstackXmlModuleHelper extends TmfAnalysisModuleHelperXml {
-
-    static interface ISubModuleHelper {
-        public Collection<IAnalysisModuleHelper> getHelpers();
-
-        public @Nullable IAnalysisModule getAnalysis(ITmfTrace trace);
-    }
-
-    static class HiddenModuleHelper implements ISubModuleHelper {
-        private final IAnalysisModuleHelper fHelper;
-
-        public HiddenModuleHelper(IAnalysisModuleHelper helper) {
-            fHelper = helper;
-        }
-
-        @Override
-        public Collection<IAnalysisModuleHelper> getHelpers() {
-            return Collections.singleton(fHelper);
-        }
-
-        @Override
-        public @Nullable IAnalysisModule getAnalysis(@NonNull ITmfTrace trace) {
-            try {
-                return fHelper.newModule(trace);
-            } catch (TmfAnalysisException e) {
-                Activator.getInstance().logError(e.getMessage());
-            }
-            return null;
-        }
-    }
-
-    static class RefModuleHelper implements ISubModuleHelper {
-        private final String fAnalysisId;
-
-        public RefModuleHelper(String id) {
-            fAnalysisId = id;
-        }
-
-        @Override
-        public @NonNull Collection<IAnalysisModuleHelper> getHelpers() {
-            Multimap<String, IAnalysisModuleHelper> analysisModules = TmfAnalysisManager.getAnalysisModules();
-            Collection<IAnalysisModuleHelper> collection = analysisModules.get(fAnalysisId);
-            if (collection.isEmpty()) {
-                Activator.getInstance().logWarning("Callstack XML analysis: no analysis called " + fAnalysisId); //$NON-NLS-1$
-            }
-            return collection;
-        }
-
-        @Override
-        public @Nullable IAnalysisModule getAnalysis(@NonNull ITmfTrace trace) {
-            return trace.getAnalysisModule(fAnalysisId);
-        }
-    }
-
-    private final ISubModuleHelper fHelper;
-
-    /**
-     * Constructor
-     *
-     * @param xmlFile
-     *            The XML file this element comes from
-     * @param node
-     *            The XML element for this callstack
-     */
-    public CallstackXmlModuleHelper(File xmlFile, Element node) {
-        super(xmlFile, node, XmlAnalysisModuleType.OTHER);
-        /* Create the helper for the underlying module or set its analysis ID */
-        List<@NonNull Element> childElements = TmfXmlUtils.getChildElements(node, TmfXmlStrings.PATTERN);
-        if (!childElements.isEmpty()) {
-            // Create a helper for this module
-            fHelper = new HiddenModuleHelper(new TmfAnalysisModuleHelperXml(xmlFile, childElements.get(0), XmlAnalysisModuleType.PATTERN));
-            return;
-        }
-        childElements = TmfXmlUtils.getChildElements(node, TmfXmlStrings.STATE_PROVIDER);
-        if (!childElements.isEmpty()) {
-            // Create a helper for this module
-            fHelper = new HiddenModuleHelper(new TmfAnalysisModuleHelperXml(xmlFile, childElements.get(0), XmlAnalysisModuleType.STATE_SYSTEM));
-            return;
-        }
-        childElements = TmfXmlUtils.getChildElements(node, TmfXmlStrings.ANALYSIS);
-        if (childElements.isEmpty()) {
-            throw new IllegalStateException("XML callstack element: there should be one of {pattern, stateProvider, analysis}. none found"); //$NON-NLS-1$
-        }
-        // Create a helper for this module
-        fHelper = new RefModuleHelper(String.valueOf(childElements.get(0).getAttribute(TmfXmlStrings.ID)));
-        return;
-    }
-
-    @Override
-    protected IAnalysisModule createOtherModule(@NonNull String analysisid, @NonNull String name) {
-        IAnalysisModule module = new CallstackXmlAnalysis(getSourceFile(), fHelper);
-        module.setId(analysisid);
-        module.setName(name);
-        return module;
-    }
-
-    @Override
-    public String getName() {
-        return fHelper.getHelpers().stream()
-                .map(h -> h.getName())
-                .findFirst()
-                .get();
-    }
-
-    @Override
-    @NonNullByDefault({})
-    public boolean appliesToTraceType(Class<? extends ITmfTrace> traceClass) {
-        List<IAnalysisModuleHelper> collect = fHelper.getHelpers().stream()
-                .filter(h -> h.appliesToTraceType(traceClass))
-                .collect(Collectors.toList());
-        return !collect.isEmpty();
-    }
-
-}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java
deleted file mode 100644
index 1cfb9fd04..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlSchemaParser.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-package org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-import org.eclipse.tracecompass.tmf.analysis.xml.core.module.ITmfXmlSchemaParser;
-import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModuleHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * Class that will parse the XML schema and extract the helpers for data-driven
- * callstack analyses
- *
- * @author Geneviève Bastien
- */
-public class CallstackXmlSchemaParser implements ITmfXmlSchemaParser {
-
-    @Override
-    public Collection<? extends IAnalysisModuleHelper> getModuleHelpers(File xmlFile, Document doc) {
-        List<IAnalysisModuleHelper> list = new ArrayList<>();
-        NodeList callstackNodes = doc.getElementsByTagName(CallstackXmlStrings.CALLSTACK);
-        for (int i = 0; i < callstackNodes.getLength(); i++) {
-            Element node = Objects.requireNonNull((Element) callstackNodes.item(i));
-
-            IAnalysisModuleHelper helper = new CallstackXmlModuleHelper(xmlFile, node);
-            list.add(helper);
-        }
-        return list;
-    }
-
-}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlStrings.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlStrings.java
deleted file mode 100644
index efe94a16b..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/CallstackXmlStrings.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-package org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack;
-
-/**
- * This file defines all name in the XML Structure for the State Provider
- *
- * @author Geneviève Bastien
- * @noimplement This interface only contains static defines
- */
-@SuppressWarnings({ "javadoc"})
-public interface CallstackXmlStrings {
-
-    /** The callstack base element string */
-    String CALLSTACK = "callstack"; //$NON-NLS-1$
-    String CALLSTACK_LEVEL = "level"; //$NON-NLS-1$
-    String CALLSTACK_PATH = "path"; //$NON-NLS-1$
-    String CALLSTACK_HOST = "host"; //$NON-NLS-1$
-    String CALLSTACK_THREAD = "thread"; //$NON-NLS-1$
-    String CALLSTACK_THREADCPU = "cpu"; //$NON-NLS-1$
-    String CALLSTACK_THREADLEVEL = "level"; //$NON-NLS-1$
-    String CALLSTACK_THREADLEVEL_NAME = "name"; //$NON-NLS-1$
-    String CALLSTACK_THREADLEVEL_TYPE = "type"; //$NON-NLS-1$
-    String CALLSTACK_THREADLEVEL_VALUE = "value"; //$NON-NLS-1$
-    String CALLSTACK_GROUP = "callstackGroup"; //$NON-NLS-1$
-
-}
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/package-info.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/package-info.java
deleted file mode 100644
index f733f8844..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/internal/callstack/core/xml/callstack/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 École Polytechnique de Montréal
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-
-@org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.incubator.internal.callstack.core.xml.callstack;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/xsd_files/xmlCallstack.xsd b/callstack/org.eclipse.tracecompass.incubator.callstack.core/xsd_files/xmlCallstack.xsd
deleted file mode 100644
index 0904c5f39..000000000
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/xsd_files/xmlCallstack.xsd
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- ***************************************************************************
- * Copyright (c) 2016 École Polytechnique de Montréal and others
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *************************************************************************** -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	attributeFormDefault="unqualified" elementFormDefault="qualified">
-    
-	<xs:element name="callstack" substitutionGroup="extra" type="callstackType"/>
-	
-	<xs:complexType name="callstackType">
-		<xs:complexContent>
-			<xs:extension base="extraType">
-				<xs:annotation>
-					<xs:documentation>Declares a callstack path in the state system. If part of the state system describes a callstack, defining a callstack element will allow the analysis to have access to all callstack analysis information.</xs:documentation>
-				</xs:annotation>
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="1" name="callstackGroup" type="callstackGroup">
-						<xs:annotation>
-							<xs:documentation>Defines a value that maps a string used in the pattern state provider to a numbered value.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:choice maxOccurs="1" minOccurs="1">
-						<xs:element maxOccurs="1" minOccurs="0" name="analysis">
-							<xs:annotation>
-								<xs:documentation>The ID of the analysis whose state system is to be used as base for the state system. Both the callstack and the analysis it links to will appear for a given trace. The trace type it applies to are the same as the base analysis.</xs:documentation>
-							</xs:annotation>
-							<xs:complexType>
-								<xs:attribute name="id" type="xs:string" use="required">
-									<xs:annotation>
-										<xs:documentation>The ID of the analysis whose state system is to be used as base for the state system. Both the callstack and the analysis it links to will appear for a given trace. The trace type it applies to are the same as the base analysis.</xs:documentation>
-									</xs:annotation>
-								</xs:attribute>
-							</xs:complexType>
-						</xs:element>
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="pattern" type="pattern" >
-							<xs:annotation>
-								<xs:documentation>Defines an internal pattern analysis that will be used to populate the callstack. This analysis will not appear under the trace, only the callstack one, but its label and trace type will be used for the callstack analysis</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="stateProvider" type="stateProvider" >
-							<xs:annotation>
-								<xs:documentation>Defines an internal state system analysis that will be used to populate the callstack. This analysis will not appear under the trace, only the callstack one, but its label and trace type will be used for the callstack analysis</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:choice>
-				</xs:sequence>
-				<xs:attribute name="id" type="xs:string" use="required" >
-					<xs:annotation>
-						<xs:documentation>The unique ID of this callstack. It will be used to identify the analysis that will be built from this pattern provider.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-   
-	<xs:complexType name="callstackGroup">
-		<xs:annotation>
-			<xs:documentation>Declares a callstack path in the state system. If part of the state system describes a callstack, defining a callstack element will allow the analysis to have access to all callstack analysis information.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element maxOccurs="unbounded" minOccurs="0" name="level" type="callstackLevel">
-				<xs:annotation>
-					<xs:documentation>Defines the path in the state system that describes a level of the callstack.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element maxOccurs="1" minOccurs="0" name="thread" type="callstackThreadProvider">
-				<xs:annotation>
-					<xs:documentation>Defines how to get the thread ID of the thread doing the callstack.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element maxOccurs="1" minOccurs="0" name="host" type="callstackHostProvider">
-				<xs:annotation>
-					<xs:documentation>Defines how to get the host ID for a callstack.</xs:documentation>
-				</xs:annotation>
-			</xs:element>		
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:documentation>A name to identify this callstack group</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	
-	<xs:complexType name="callstackLevel">
-		<xs:annotation>
-			<xs:documentation>Defines a level in the callstack</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="path" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:documentation>The path from the root of the state system where the callstack process pattern starts. It can be empty.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	
-	<xs:complexType name="callstackThreadProvider">
-		<xs:annotation>
-			<xs:documentation>Defines the way to get the thread ID for the callstack.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="cpu" type="xs:string" use="optional">
-			<xs:annotation>
-				<xs:documentation>The path relative to the last element of the callstack where to find the CPU that will be used to get the Thread ID.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="level" type="xs:integer" use="optional">
-			<xs:annotation>
-				<xs:documentation>The level whose value contains the thread ID.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="type" use="optional">
-			<xs:annotation>
-				<xs:documentation>Describe where at this level the thread ID value is.</xs:documentation>
-			</xs:annotation>
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="name" >
-						<xs:annotation>
-							<xs:documentation>The thread ID is the name of the level</xs:documentation></xs:annotation></xs:enumeration>
-					<xs:enumeration value="value" >
-						<xs:annotation>
-							<xs:documentation>The thread ID is the value at this level</xs:documentation></xs:annotation></xs:enumeration>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	
-	<xs:complexType name="callstackHostProvider">
-		<xs:annotation>
-			<xs:documentation>Defines the way to get the host ID for the callstack.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="level" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>The level whose data to use to get the host ID.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="type" use="optional">
-			<xs:annotation>
-				<xs:documentation>Describe where at this level the host ID is.</xs:documentation>
-			</xs:annotation>
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="name" >
-						<xs:annotation>
-							<xs:documentation>The host ID is the name of the level</xs:documentation></xs:annotation></xs:enumeration>
-					<xs:enumeration value="value" >
-						<xs:annotation>
-							<xs:documentation>The host ID is the value at this level</xs:documentation></xs:annotation></xs:enumeration>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF b/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF
index a6731e32f..97af6b779 100644
--- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF
+++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.incubator.filters.core;resolution:=optional,
  org.eclipse.tracecompass.tmf.cli.core,
  org.eclipse.tracecompass.incubator.analysis.core;resolution:=optional,
- org.eclipse.tracecompass.incubator.callstack.core;resolution:=optional,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.tracecompass.analysis.timing.core;resolution:=optional
 Export-Package: org.eclipse.tracecompass.incubator.internal.scripting.core;x-friends:="org.eclipse.tracecompass.incubator.scripting.core.tests,org.eclipse.tracecompass.incubator.scripting.ui.tests",
  org.eclipse.tracecompass.incubator.internal.scripting.core.analysis;x-friends:="org.eclipse.tracecompass.incubator.scripting.core.tests,org.eclipse.tracecompass.incubator.scripting.ui",
diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java
index 01921cfeb..070493189 100644
--- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java
+++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java
@@ -15,16 +15,16 @@
 import org.eclipse.ease.modules.WrapToScript;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.AllGroupDescriptor;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeGroupDescriptor;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeGroupBy;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeGroupBy;
 import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.flamegraph.FlameGraphDataProvider;
+import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.WeightedTreeUtils;
 import org.eclipse.tracecompass.incubator.internal.scripting.core.data.provider.ScriptingDataProviderManager;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.flamegraph.FlameGraphDataProvider;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.AllGroupDescriptor;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
 /**
@@ -33,14 +33,14 @@
  * trace by requesting an analysis that implements the interface.
  * <p>
  * For example, the following scriptlet would get the LTTng-UST CallStack
- * (Incubator) analysis, which implements the weighted tree provider, for the
- * active LTTng UST trace. The object can then be used as parameter for the
- * methods of this module.
+ * analysis, which implements the weighted tree provider, for the active LTTng
+ * UST trace. The object can then be used as parameter for the methods of this
+ * module.
  * </p>
  *
  * <pre>
  * trace = getActiveTrace()
- * wtProvider = getTraceAnalysis(trace, "org.eclipse.tracecompass.incubator.callstack.core.lttng.ust");
+ * wtProvider = getTraceAnalysis(trace, "org.eclipse.tracecompass.lttng2.ust.core.analysis.callstack");
  * </pre>
  *
  * @author Geneviève Bastien
diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
index 3c4a33ae5..228c8ecdd 100644
--- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
+++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
@@ -24,9 +24,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ease.ui,
  org.eclipse.core.expressions,
  org.eclipse.tracecompass.rcp.ui;resolution:=optional,
- org.eclipse.tracecompass.incubator.analysis.core;resolution:=optional,
- org.eclipse.tracecompass.incubator.callstack.core;resolution:=optional,
- org.eclipse.tracecompass.incubator.callstack.ui;resolution:=optional
+ org.eclipse.tracecompass.analysis.profiling.core,
+ org.eclipse.tracecompass.analysis.profiling.ui
 Export-Package: org.eclipse.tracecompass.incubator.internal.scripting.ui;x-friends:="org.eclipse.tracecompass.incubator.scripting.ui.tests",
  org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;x-internal:=true,
  org.eclipse.tracecompass.incubator.internal.scripting.ui.tracemarker;x-internal:=true,
diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java
index 0afb80c9a..1bbb36c5b 100644
--- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java
+++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/callstack/CallStackUiScriptingModule.java
@@ -14,10 +14,10 @@
 import org.eclipse.ease.modules.WrapToScript;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.flamegraph.FlameGraphDataProvider;
-import org.eclipse.tracecompass.incubator.internal.callstack.ui.flamegraph.FlameGraphView;
 import org.eclipse.tracecompass.incubator.internal.scripting.ui.views.timegraph.ScriptedTimeGraphView;
 import org.eclipse.tracecompass.incubator.scripting.core.callstack.CallStackScriptingModule;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.flamegraph.FlameGraphDataProvider;
+import org.eclipse.tracecompass.internal.analysis.profiling.ui.flamegraph2.FlameGraphView;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbench;
diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java
index c10b9ecda..e8903065f 100644
--- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java
+++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/views/ViewModule.java
@@ -89,10 +89,10 @@ public void openTimeGraphView(ITimeGraphDataProvider<TimeGraphEntryModel> dataPr
      * that will be the source of the view and looking in the 'Properties' view
      * for the ID property.
      *
-     * For example, to open a table view for the LTTng-UST CallStack (Incubator) analysis, the follow call can be make
+     * For example, to open a table view for the LTTng-UST CallStack analysis, the follow call can be made
      *
      * <pre>
-     * showView(org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.SegmentStoreTableView.ID, "org.eclipse.tracecompass.incubator.callstack.core.lttng.ust");
+     * showView(org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.SegmentStoreTableView.ID, "org.eclipse.tracecompass.lttng2.ust.core.analysis.callstack");
      * </pre>
      *
      * @param viewId
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
index 546f44d52..e6afbf35e 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Trace Compass Trace Server (Jersey Rest)" uid="traceserver" id="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.id" application="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.id" version="0.9.0.qualifier" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Trace Compass Trace Server (Jersey Rest)" uid="traceserver" id="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.id" application="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.id" version="0.9.0.qualifier" type="bundles" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -141,8 +141,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filebuffers"/>
       <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
+      <plugin id="org.eclipse.core.filesystem.macosx"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.resources"/>
       <plugin id="org.eclipse.core.runtime"/>
@@ -151,9 +151,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"/>
+      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
+      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.jetty.http"/>
@@ -164,7 +164,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.jetty.util"/>
       <plugin id="org.eclipse.ltk.core.refactoring"/>
       <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+      <plugin id="org.eclipse.osgi.compatibility.state"/>
       <plugin id="org.eclipse.osgi.services"/>
       <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.text"/>
@@ -179,10 +179,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.tracecompass.ctf.parser"/>
       <plugin id="org.eclipse.tracecompass.datastore.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.analysis.core"/>
-      <plugin id="org.eclipse.tracecompass.incubator.callstack.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.ftrace.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.opentracing.core"/>
-      <plugin id="org.eclipse.tracecompass.incubator.rocm.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.traceevent.core"/>
       <plugin id="org.eclipse.tracecompass.jsontrace.core"/>
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
index d14533e04..5f8555db6 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
@@ -177,10 +177,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.tracecompass.ctf.parser"/>
       <plugin id="org.eclipse.tracecompass.datastore.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.analysis.core"/>
-      <plugin id="org.eclipse.tracecompass.incubator.callstack.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.ftrace.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.opentracing.core"/>
-      <plugin id="org.eclipse.tracecompass.incubator.rocm.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core"/>
       <plugin id="org.eclipse.tracecompass.incubator.traceevent.core"/>
       <plugin id="org.eclipse.tracecompass.jsontrace.core"/>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF
index b8b22182c..ff8180b97 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/META-INF/MANIFEST.MF
@@ -14,12 +14,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.tracecompass.tmf.core;bundle-version="3.2.0",
  org.eclipse.tracecompass.tmf.ctf.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.analysis.counters.core,
- org.eclipse.tracecompass.incubator.analysis.core;bundle-version="0.0.1",
- org.eclipse.tracecompass.analysis.timing.core;bundle-version="5.2.1",
- org.eclipse.tracecompass.segmentstore.core;bundle-version="3.0.1"
+ org.eclipse.tracecompass.analysis.timing.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
+ org.eclipse.tracecompass.segmentstore.core
 Export-Package: org.eclipse.tracecompass.incubator.internal.otf2.core;x-friends:="org.eclipse.tracecompass.incubator.otf2.core.tests",
  org.eclipse.tracecompass.incubator.internal.otf2.core.analysis;x-friends:="org.eclipse.tracecompass.incubator.otf2.ui",
  org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.callstack;x-friends:="org.eclipse.tracecompass.incubator.otf2.ui",
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java
index b15e9f1a3..0211802b8 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallStackStateProvider.java
@@ -22,8 +22,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
-import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.AbstractOtf2StateProvider;
 import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.IOtf2Constants;
 import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.IOtf2Events;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java
index 3121f2404..8966b8a43 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/callstack/Otf2CallstackAnalysis.java
@@ -17,10 +17,10 @@
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdResolver;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries.IThreadIdResolver;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.AbstractOtf2Analysis;
 import org.eclipse.tracecompass.incubator.internal.otf2.core.analysis.IOtf2Constants;
 import org.eclipse.tracecompass.incubator.otf2.core.trace.Otf2Trace;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java
index a3bcb8136..7865f17cf 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/flows/Otf2FlowsDataProvider.java
@@ -22,7 +22,7 @@
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.Activator;
+import org.eclipse.tracecompass.incubator.internal.otf2.core.Activator;
 import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java
index ff640cacc..eb4ff6ed4 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2.core/src/org/eclipse/tracecompass/incubator/internal/otf2/core/analysis/summarytimeline/Otf2SummaryTimelineDataProvider.java
@@ -23,7 +23,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.Activator;
+import org.eclipse.tracecompass.incubator.internal.otf2.core.Activator;
 import org.eclipse.tracecompass.internal.analysis.os.linux.core.inputoutput.IODataPalette;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml
index 5c43ba338..33118d936 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.otf2/feature.xml
@@ -25,32 +25,22 @@
       <import plugin="org.eclipse.tracecompass.common.core"/>
       <import plugin="org.eclipse.tracecompass.tmf.core"/>
       <import plugin="com.google.guava"/>
-      <import plugin="org.eclipse.tracecompass.incubator.callstack.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.os.linux.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.analysis.core"/>
       <import plugin="org.eclipse.tracecompass.segmentstore.core"/>
       <import plugin="org.eclipse.tracecompass.tmf.ctf.core"/>
+      <import plugin="org.eclipse.tracecompass.analysis.profiling.core"/>
    </requires>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.otf2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.otf2.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.otf2.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/> 
+         version="0.0.0"/>
 
 </feature>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF
index f9a72708d..0ff7ac469 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/META-INF/MANIFEST.MF
@@ -15,9 +15,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.tmf.core.tests,
- org.eclipse.tracecompass.incubator.analysis.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.tracecompass.analysis.timing.core
 Export-Package: org.eclipse.tracecompass.incubator.perf.profiling.core.tests,
  org.eclipse.tracecompass.incubator.perf.profiling.core.tests.callgraph
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java
index 7c5faa13b..abe911be6 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core.tests/src/org/eclipse/tracecompass/incubator/perf/profiling/core/tests/callgraph/PerfCallGraphTest.java
@@ -22,8 +22,8 @@
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.ISamplingDataProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.AggregatedCallSite;
+import org.eclipse.tracecompass.analysis.profiling.core.model.ISamplingDataProvider;
 import org.eclipse.tracecompass.incubator.internal.perf.profiling.core.callgraph.PerfCallchainAnalysisModule;
 import org.eclipse.tracecompass.incubator.perf.profiling.core.tests.ActivatorTest;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF
index a7bde56f9..5e020998f 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/META-INF/MANIFEST.MF
@@ -13,13 +13,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.tmf.core;bundle-version="3.2.0",
  org.eclipse.tracecompass.tmf.ctf.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.lttng2.kernel.core,
  org.eclipse.tracecompass.lttng2.common.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
- org.eclipse.cdt.core,
- org.eclipse.tracecompass.incubator.analysis.core,
  org.eclipse.tracecompass.analysis.timing.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
+ org.eclipse.cdt.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.incubator.internal.perf.profiling.core;x-friends:="org.eclipse.tracecompass.incubator.perf.profiling.core.tests",
  org.eclipse.tracecompass.incubator.internal.perf.profiling.core.callgraph;x-friends:="org.eclipse.tracecompass.incubator.perf.profiling.core.tests",
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java
index a8c73efba..fbe549348 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling.core/src/org/eclipse/tracecompass/incubator/internal/perf/profiling/core/callgraph/PerfCallchainAnalysisModule.java
@@ -20,13 +20,13 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.AggregatedCallSite;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.ISamplingDataProvider;
-import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeGroupDescriptor;
-import org.eclipse.tracecompass.incubator.callstack.core.base.CallStackElement;
-import org.eclipse.tracecompass.incubator.callstack.core.base.CallStackGroupDescriptor;
-import org.eclipse.tracecompass.incubator.callstack.core.base.ICallStackElement;
-import org.eclipse.tracecompass.incubator.callstack.core.sampled.callgraph.ProfilingCallGraphAnalysisModule;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callgraph.AggregatedCallSite;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.CallStackGroupDescriptor;
+import org.eclipse.tracecompass.analysis.profiling.core.model.ISamplingDataProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.sampled.callgraph.ProfilingCallGraphAnalysisModule;
+import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeGroupDescriptor;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml
index dccc663bb..844b8ba48 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.perf.profiling/feature.xml
@@ -24,30 +24,23 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.tracecompass.common.core"/>
       <import plugin="org.eclipse.tracecompass.tmf.ctf.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.callstack.core"/>
       <import plugin="org.eclipse.tracecompass.lttng2.kernel.core"/>
       <import plugin="org.eclipse.tracecompass.lttng2.common.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.os.linux.core"/>
       <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.analysis.core"/>
       <import plugin="com.google.guava"/>
       <import plugin="org.eclipse.tracecompass.tmf.ui"/>
-      <import feature="org.eclipse.tracecompass.incubator.callstack"/>
       <import plugin="org.eclipse.tracecompass.tmf.core" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.tracecompass.analysis.profiling.core"/>
    </requires>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.perf.profiling.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.perf.profiling.doc.user"
-         download-size="0"
-         install-size="0"
          version="0.0.0"/>
 
 </feature>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF
index cd880d737..9d271f00c 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/META-INF/MANIFEST.MF
@@ -14,8 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.tmf.ctf.core,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.ctf.core,
- org.eclipse.tracecompass.incubator.analysis.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.segmentstore.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.analysis.timing.core,
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/xml_analyses/GroupedTasks.xml b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/xml_analyses/GroupedTasks.xml
index c5b3877f4..79853996a 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/xml_analyses/GroupedTasks.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass.core/xml_analyses/GroupedTasks.xml
@@ -98,7 +98,7 @@
 				<stateChange>
 					<stateAttribute type="constant" value="#CurrentScenario" />
 					<stateAttribute type="constant" value="component" />
-					<stateValue type="script" value="cat == null ? 'UNKNOWN' : cat" scriptEngine="nashorn" >
+					<stateValue type="script" value="cat == null ? 'UNKNOWN' : cat" >
 						<stateValue id="cat" type="eventField" value="cat" />
 					</stateValue>
 				</stateChange>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml
index a5bf5ac66..774910d24 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.tracecompass/feature.xml
@@ -26,8 +26,6 @@
       <import plugin="org.eclipse.tracecompass.tmf.ctf.core"/>
       <import plugin="org.eclipse.tracecompass.tmf.core"/>
       <import plugin="org.eclipse.tracecompass.ctf.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.analysis.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.callstack.core"/>
       <import plugin="org.eclipse.tracecompass.segmentstore.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.os.linux.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.timing.core"/>
@@ -40,9 +38,6 @@
 
    <plugin
          id="org.eclipse.tracecompass.incubator.tracecompass.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF
index 62f212f98..d92b866cc 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/META-INF/MANIFEST.MF
@@ -12,12 +12,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.incubator.traceevent.core,
  org.junit,
  org.eclipse.tracecompass.tmf.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.jsontrace.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.tracecompass.statesystem.core.tests,
  org.eclipse.tracecompass.tmf.core.tests,
  org.eclipse.tracecompass.incubator.analysis.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.tracecompass.analysis.timing.core
 Export-Package: org.eclipse.tracecompass.incubator.traceevent.core.tests
 Import-Package: com.google.common.base,
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java
index 99ece46a9..82032ccb5 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/CallStackStateProviderTest.java
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
-import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.analysis.callstack.TraceEventCallstackAnalysis;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.trace.TraceEventTrace;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java
index 87d7c8f86..9c71e0aba 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core.tests/src/org/eclipse/tracecompass/incubator/traceevent/core/tests/InstrumentedCallStackArrowsTest.java
@@ -24,7 +24,7 @@
 
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.analysis.callstack.TraceEventCallstackAnalysis;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.trace.TraceEventTrace;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF
index 717a8bec2..f5de52ef9 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.segmentstore.core,
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.incubator.analysis.core,
  org.eclipse.tracecompass.analysis.counters.core,
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java
index 576050ee4..332e6081f 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallStackProvider.java
@@ -28,10 +28,10 @@
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.callstack.core.base.EdgeStateValue;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.EdgeStateValue;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.event.ITraceEventConstants;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.event.TraceEventAspects;
 import org.eclipse.tracecompass.incubator.internal.traceevent.core.event.TraceEventField;
@@ -41,6 +41,8 @@
 import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
+import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
+import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.statesystem.TmfAttributePool;
@@ -223,9 +225,9 @@ protected boolean considerEvent(@NonNull ITmfEvent event) {
     }
 
     @Override
-    protected @Nullable Object functionEntry(@NonNull ITmfEvent event) {
+    protected @Nullable ITmfStateValue functionEntry(@NonNull ITmfEvent event) {
         if (isEntry(event)) {
-            return event.getName();
+            return TmfStateValue.newValueString(event.getName());
         }
         return null;
     }
@@ -236,9 +238,9 @@ private static boolean isEntry(ITmfEvent event) {
     }
 
     @Override
-    protected @Nullable Object functionExit(@NonNull ITmfEvent event) {
+    protected @Nullable ITmfStateValue functionExit(@NonNull ITmfEvent event) {
         if (isExit(event)) {
-            return event.getName();
+            return TmfStateValue.newValueString(event.getName());
         }
         return null;
     }
@@ -477,7 +479,7 @@ private static int getAvailableEdgeQuark(ITmfStateSystemBuilder ssb, long startT
     }
 
     private void handleStart(@NonNull ITmfEvent event, ITmfStateSystemBuilder ss, long timestamp, String processName) {
-        Object functionBeginName = functionEntry(event);
+        ITmfStateValue functionBeginName = functionEntry(event);
         if (functionBeginName != null) {
             int processQuark = ss.getQuarkAbsoluteAndAdd(PROCESSES, processName);
             int pid = getProcessId(event);
@@ -492,7 +494,7 @@ private void handleStart(@NonNull ITmfEvent event, ITmfStateSystemBuilder ss, lo
             ss.modifyAttribute(timestamp, threadId, threadQuark);
 
             int callStackQuark = ss.getQuarkRelativeAndAdd(threadQuark, InstrumentedCallStackAnalysis.CALL_STACK);
-            ss.pushAttribute(timestamp, functionBeginName, callStackQuark);
+            ss.pushAttribute(timestamp, functionBeginName.unboxValue(), callStackQuark);
             prepareNextSlice(ss, callStackQuark, timestamp);
         }
     }
@@ -505,8 +507,9 @@ private static void prepareNextSlice(ITmfStateSystemBuilder ss, int quark, long
 
     private void handleEnd(@NonNull ITmfEvent event, ITmfStateSystemBuilder ss, long timestamp, String processName) {
         /* Check if the event is a function exit */
-        Object functionExitName = functionExit(event);
-        if (functionExitName != null) {
+        ITmfStateValue functionExitState = functionExit(event);
+        if (functionExitState != null) {
+            String functionExitName = functionExitState.unboxStr();
             String pName = processName;
 
             if (pName == null) {
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java
index 53012fc0f..d59da042a 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/callstack/TraceEventCallstackAnalysis.java
@@ -16,7 +16,7 @@
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.tmf.core.analysis.requirements.TmfAbstractAnalysisRequirement;
 import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/xml_analysis/GroupedTasksTraceEvent.xml b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/xml_analysis/GroupedTasksTraceEvent.xml
index 3a53882dc..5233f0da2 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/xml_analysis/GroupedTasksTraceEvent.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/xml_analysis/GroupedTasksTraceEvent.xml
@@ -96,7 +96,7 @@
 			<stateChange>
 				<stateAttribute type="constant" value="#CurrentScenario" />
 				<stateAttribute type="constant" value="component" />
-				<stateValue type="script" value="cat == null ? 'UNKNOWN' : cat" scriptEngine="nashorn" >
+				<stateValue type="script" value="cat == null ? 'UNKNOWN' : cat" >
 					<stateValue id="cat" type="eventField" value="cat" />
 				</stateValue>
 			</stateChange>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml
index 3622fb0d6..aa1918066 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent/feature.xml
@@ -25,7 +25,6 @@
       <import plugin="org.eclipse.tracecompass.common.core"/>
       <import plugin="org.eclipse.tracecompass.tmf.core"/>
       <import plugin="org.eclipse.tracecompass.segmentstore.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.callstack.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.os.linux.core"/>
       <import plugin="org.eclipse.tracecompass.incubator.analysis.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.counters.core"/>
@@ -40,22 +39,15 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.tracecompass.tmf.ui"/>
       <import plugin="org.eclipse.swt"/>
-      <import feature="org.eclipse.tracecompass.incubator.callstack"/>
       <import plugin="org.eclipse.tracecompass.jsontrace.core"/>
    </requires>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.traceevent.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.traceevent.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF
index dc56645b7..c3846feac 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.tmf.core;bundle-version="3.2.0",
- org.eclipse.tracecompass.incubator.callstack.core,
  org.eclipse.tracecompass.incubator.analysis.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.analysis.timing.core,
  org.eclipse.tracecompass.segmentstore.core,
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java
index 61f0fb9d1..333dd4371 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackAnalysis.java
@@ -14,7 +14,7 @@
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
 import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.Uftrace;
 import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java
index 0de4b49a4..a544b4a71 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace.core/src/org/eclipse/tracecompass/incubator/internal/uftrace/core/analysis/UfCallstackProvider.java
@@ -14,10 +14,12 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackStateProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackStateProvider;
 import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.DatEvent;
 import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.UfEventType;
 import org.eclipse.tracecompass.incubator.internal.uftrace.core.trace.Uftrace.PidAspect;
+import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue;
+import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
@@ -64,26 +66,26 @@ protected boolean considerEvent(@NonNull ITmfEvent event) {
     }
 
     @Override
-    protected @Nullable Object functionEntry(@NonNull ITmfEvent event) {
+    protected @Nullable ITmfStateValue functionEntry(@NonNull ITmfEvent event) {
         ITmfEventField content = event.getContent();
         Object payload = content.getValue();
         if (payload instanceof DatEvent) {
             DatEvent ev = (DatEvent) payload;
             if (event.getType().equals(UfEventType.ENTRY)) {
-                return ev.getAddress();
+                return TmfStateValue.newValueLong(ev.getAddress());
             }
         }
         return null;
     }
 
     @Override
-    protected @Nullable Object functionExit(@NonNull ITmfEvent event) {
+    protected @Nullable ITmfStateValue functionExit(@NonNull ITmfEvent event) {
         ITmfEventField content = event.getContent();
         Object payload = content.getValue();
         if (payload instanceof DatEvent) {
             DatEvent ev = (DatEvent) payload;
             if (event.getType().equals(UfEventType.EXIT)) {
-                return ev.getAddress();
+                return TmfStateValue.newValueLong(ev.getAddress());
             }
         }
         return null;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml b/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml
index c408fba33..3bd1a8ba6 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml
+++ b/tracetypes/org.eclipse.tracecompass.incubator.uftrace/feature.xml
@@ -23,26 +23,20 @@
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.tracecompass.common.core"/>
-      <import plugin="org.eclipse.tracecompass.incubator.callstack.core"/>
       <import plugin="com.google.guava"/>
       <import plugin="org.apache.commons.io"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.tracecompass.tmf.core" version="3.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tracecompass.incubator.analysis.core"/>
       <import plugin="org.eclipse.tracecompass.analysis.os.linux.core"/>
+      <import plugin="org.eclipse.tracecompass.analysis.profiling.core"/>
    </requires>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.uftrace.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.uftrace.doc.user"
-         download-size="0"
-         install-size="0"
          version="0.0.0"/>
 
 </feature>
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF
index 782f655e5..e78c7c186 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests/META-INF/MANIFEST.MF
@@ -19,8 +19,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.analysis.os.linux.core.tests,
  org.eclipse.tracecompass.tmf.core.tests,
  org.eclipse.tracecompass.statesystem.core.tests,
- org.eclipse.tracecompass.incubator.callstack.core,
- org.eclipse.tracecompass.incubator.analysis.core,
+ org.eclipse.tracecompass.analysis.timing.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests,
  org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests.fused,
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF
index cc2b1f863..0a77b8e8e 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/META-INF/MANIFEST.MF
@@ -14,10 +14,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.tracecompass.tmf.ctf.core,
- org.eclipse.tracecompass.incubator.analysis.core,
  org.eclipse.tracecompass.segmentstore.core,
  org.eclipse.tracecompass.analysis.timing.core,
- org.eclipse.tracecompass.incubator.callstack.core,
+ org.eclipse.tracecompass.analysis.profiling.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core;x-internal:=true,
  org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.data;x-friends:="org.eclipse.tracecompass.incubator.virtual.machine.analysis.core.tests,org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui",
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java
index a14199391..e92de43bc 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/model/qemukvm/QemuKvmVmModel.java
@@ -27,11 +27,11 @@
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelThreadInformationProvider;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualMachineModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualCPU;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualMachine;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventField;
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java
index 9f9fd06ea..db799572e 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadAnalysis.java
@@ -17,19 +17,20 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.callstack.core.base.ICallStackElement;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils.IHostIdProvider;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils.TraceHostIdResolver;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdProvider;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackSeries.IThreadIdResolver;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.CallStackHostUtils;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
-import org.eclipse.tracecompass.incubator.internal.callstack.core.instrumented.InstrumentedCallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils.IHostIdProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils.IHostIdResolver;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackHostUtils.TraceHostIdResolver;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries.IThreadIdProvider;
+import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries.IThreadIdResolver;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.FusedVMInformationProvider;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.fused.FusedVirtualMachineAnalysis;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.analysis.VirtualMachineModelAnalysis;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.virtual.resources.VirtualResourcesAnalysis;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.InstrumentedCallStackElement;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
@@ -202,30 +203,30 @@ protected TraceHostIdResolver getCallStackHostResolver(ITmfTrace trace) {
     }
 
     @Override
-    public @NonNull String getHostId() {
+    public IHostIdResolver getHostIdResolver() {
         // The host ID is the one from the host
         ITmfTrace trace = getTrace();
         if (trace == null) {
-            return super.getHostId();
+            return super.getHostIdResolver();
         }
         // FIXME: There should be a better way to get the host ID
         FusedVirtualMachineAnalysis analysisModule = TmfTraceUtils.getAnalysisModuleOfClass(trace, FusedVirtualMachineAnalysis.class, FusedVirtualMachineAnalysis.ID);
         if (analysisModule == null) {
-            return super.getHostId();
+            return super.getHostIdResolver();
         }
         analysisModule.schedule();
         analysisModule.waitForCompletion();
         ITmfStateSystem stateSystem = analysisModule.getStateSystem();
         if (stateSystem == null) {
-            return super.getHostId();
+            return super.getHostIdResolver();
         }
         Optional<ITmfTrace> hostTrace = TmfTraceManager.getTraceSet(trace).stream()
                 .filter(t -> FusedVMInformationProvider.getParentMachineHostId(stateSystem, t.getHostId()).isEmpty())
                 .findFirst();
         if (hostTrace.isPresent()) {
-            return hostTrace.get().getHostId();
+            return new CallStackHostUtils.TraceHostIdResolver(hostTrace.get());
         }
-        return super.getHostId();
+        return super.getHostIdResolver();
     }
 
     /**
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java
index f5334023e..4b7bd0ea9 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/VmOverheadStateProvider.java
@@ -24,13 +24,13 @@
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.DefaultEventLayout;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
-import org.eclipse.tracecompass.incubator.analysis.core.concepts.ProcessStatusInterval;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.IVirtualMachineEventHandler;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualEnvironmentModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.handlers.QemuKvmEventHandler;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.handlers.SchedSwitchEventHandler;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ProcessStatusInterval;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider;
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java
index 2441b0c5f..0381e5599 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/QemuKvmEventHandler.java
@@ -19,14 +19,14 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.IVirtualMachineEventHandler;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualEnvironmentModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualCPU;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualMachine;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.VmOverheadStateProvider;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java
index 4c52927d3..49a257899 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.core/src/org/eclipse/tracecompass/incubator/internal/virtual/machine/analysis/core/overhead/handlers/SchedSwitchEventHandler.java
@@ -19,15 +19,15 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
-import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel;
-import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager;
-import org.eclipse.tracecompass.incubator.callstack.core.instrumented.statesystem.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.instrumented.InstrumentedCallStackAnalysis;
+import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.IVirtualMachineEventHandler;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.IVirtualEnvironmentModel;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualCPU;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.model.VirtualMachine;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.VmOverheadAnalysis;
 import org.eclipse.tracecompass.incubator.internal.virtual.machine.analysis.core.overhead.VmOverheadStateProvider;
+import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml
index e8f7964d5..b08054e36 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis/feature.xml
@@ -20,7 +20,6 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.tracecompass.incubator.analysis.core"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.tracecompass.common.core"/>
@@ -37,23 +36,14 @@
 
    <plugin
          id="org.eclipse.tracecompass.incubator.virtual.machine.analysis.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>