all: Make some packages internal

Javadoc is generated for the public packages, some packages are not
supposed to be public

[Changed] Cleaned API for atrace, filters, scripting and xaf

Change-Id: I4d0ddf4ac65f5646a2f3886ed9e1878af86df97e
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/144529
Tested-by: CI Bot
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

102 files changed, 250 insertions, 249 deletions

diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/META-INF/MANIFEST.MF
index 1ea90c315..54ea03deb 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/META-INF/MANIFEST.MF
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/META-INF/MANIFEST.MF
@@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.lsp4j,
  org.eclipse.lsp4j.jsonrpc
-Export-Package: org.eclipse.tracecompass.incubator.filters.core.environment,
- org.eclipse.tracecompass.incubator.filters.core.stubs,
- org.eclipse.tracecompass.incubator.filters.core.tests,
+Export-Package: org.eclipse.tracecompass.incubator.filters.core.tests,
  org.eclipse.tracecompass.incubator.filters.core.tests.client,
- org.eclipse.tracecompass.incubator.filters.core.tests.server
+ org.eclipse.tracecompass.incubator.filters.core.tests.environment,
+ org.eclipse.tracecompass.incubator.filters.core.tests.server,
+ org.eclipse.tracecompass.incubator.filters.core.tests.stubs
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.lsp.core.tests
 Import-Package: org.antlr.runtime,
  org.eclipse.tracecompass.incubator.internal.filters.ui.lspFilterTextbox
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/client/LspClientTest.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/client/LspClientTest.java
index 2c7250caf..5db933ac5 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/client/LspClientTest.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/client/LspClientTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.tracecompass.incubator.filters.core.environment.TestEnvironment;
+import org.eclipse.tracecompass.incubator.filters.core.tests.environment.TestEnvironment;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/server/ServerTest.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/server/ServerTest.java
index 4ba85c6c0..8fb844b76 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/server/ServerTest.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/src/org/eclipse/tracecompass/incubator/filters/core/tests/server/ServerTest.java
@@ -18,7 +18,7 @@ import java.util.concurrent.ExecutionException;
 import org.eclipse.lsp4j.Color;
 import org.eclipse.lsp4j.ColorInformation;
 import org.eclipse.lsp4j.CompletionItem;
-import org.eclipse.tracecompass.incubator.filters.core.environment.TestEnvironment;
+import org.eclipse.tracecompass.incubator.filters.core.tests.environment.TestEnvironment;
 import org.eclipse.tracecompass.incubator.internal.filters.core.server.SyntaxHighlighting;
 import org.junit.Test;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/environment/Stream.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/environment/Stream.java
index f8349a88d..8df91d964 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/environment/Stream.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/environment/Stream.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.environment;
+package org.eclipse.tracecompass.incubator.filters.core.tests.environment;
 
 import java.io.IOException;
 import java.io.PipedInputStream;
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/environment/TestEnvironment.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/environment/TestEnvironment.java
index d26d5fe9e..78b860320 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/environment/TestEnvironment.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/environment/TestEnvironment.java
@@ -6,13 +6,13 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.environment;
+package org.eclipse.tracecompass.incubator.filters.core.tests.environment;
 
 import java.io.IOException;
 import java.util.Objects;
 import java.util.concurrent.Semaphore;
 
-import org.eclipse.tracecompass.incubator.filters.core.stubs.TestConnector;
+import org.eclipse.tracecompass.incubator.filters.core.tests.stubs.TestConnector;
 import org.eclipse.tracecompass.incubator.internal.filters.core.client.wrapper.LanguageFilterClientWrapper;
 import org.eclipse.tracecompass.incubator.internal.filters.core.server.FilterServerFactory;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FakeClientMockup.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FakeClientMockup.java
index 047f74ed8..93dfa4802 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FakeClientMockup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FakeClientMockup.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 /**
  * Use this class to save data from FakeClientStub
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FakeClientStub.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FakeClientStub.java
index c2de117d5..9fc208334 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FakeClientStub.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FakeClientStub.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.util.List;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FilterBoxServiceMockup.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FilterBoxServiceMockup.java
index 20fd2446d..13519b356 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FilterBoxServiceMockup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FilterBoxServiceMockup.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FilterBoxServiceStub.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FilterBoxServiceStub.java
index 53536a700..8166bfd16 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/FilterBoxServiceStub.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/FilterBoxServiceStub.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPClientMockup.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPClientMockup.java
index 556ec5702..e8b30b62b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPClientMockup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPClientMockup.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.util.List;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPClientStub.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPClientStub.java
index 3e5b046b5..5703ca03d 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPClientStub.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPClientStub.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPServerMockup.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPServerMockup.java
index 569d7aeaf..34637b444 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPServerMockup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPServerMockup.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 /**
  * Use this class to save data from LSPServerStub Add attributes/functions if
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPServerStub.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPServerStub.java
index 24952f811..601ac3bda 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/LSPServerStub.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/LSPServerStub.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -14,7 +14,7 @@ import org.eclipse.lsp4j.InitializeParams;
 import org.eclipse.lsp4j.InitializeResult;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.lsp4j.services.WorkspaceService;
-import org.eclipse.tracecompass.incubator.filters.core.environment.TestEnvironment;
+import org.eclipse.tracecompass.incubator.filters.core.tests.environment.TestEnvironment;
 import org.eclipse.tracecompass.incubator.internal.filters.core.server.FilterWorkspaceService;
 
 /**
diff --git a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/TestConnector.java b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/TestConnector.java
index 781aad03b..80041c044 100644
--- a/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/stubs/TestConnector.java
+++ b/analyses/org.eclipse.tracecompass.incubator.filters.core.tests/stubs/org/eclipse/tracecompass/incubator/filters/core/tests/stubs/TestConnector.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.filters.core.stubs;
+package org.eclipse.tracecompass.incubator.filters.core.tests.stubs;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
index 367fffbf4..39963771c 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions
 Export-Package: org.eclipse.tracecompass.incubator.internal.provisional.scripting.ui.views;x-internal:=true,
  org.eclipse.tracecompass.incubator.internal.scripting.ui;x-internal:=true,
- org.eclipse.tracecompass.incubator.internal.scripting.ui.views.timegraph;x-internal:=true,
- org.eclipse.tracecompass.incubator.scripting.ui.project.handlers
+ org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.scripting.ui.views.timegraph;x-internal:=true
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.scripting.ui
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/plugin.xml b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/plugin.xml
index 0d4ad0f7a..08ccc460d 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/plugin.xml
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/plugin.xml
@@ -26,7 +26,7 @@
          point="org.eclipse.ui.commands">
             <command
             categoryId="org.eclipse.ui.category.file"
-            defaultHandler="org.eclipse.tracecompass.incubator.scripting.ui.project.handlers.LaunchAsEaseScriptHandler"
+            defaultHandler="org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers.LaunchAsEaseScriptHandler"
             description="%command.run_as_ease_script.description"
             id="org.eclipse.tracecompass.incubator.scripting.ui.command.launch_as_ease_script"
             name="%command.run_as_ease_script">
@@ -51,7 +51,7 @@
                   label="%command.run_as_ease_script"
                   tooltip="%command.run_as_ease_script.description">
             <dynamic
-                  class="org.eclipse.tracecompass.incubator.scripting.ui.project.handlers.RunAsElementTypeContributionItem"
+                  class="org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers.RunAsElementTypeContributionItem"
                   id="org.eclipse.tracecompass.incubator.scripting.ui.command.run_as_ease_script.dynamic">
             </dynamic>
             <visibleWhen
@@ -88,7 +88,7 @@
                   label="%command.debug_as_ease_script"
                   tooltip="%command.debug_as_ease_script.description">
             <dynamic
-                  class="org.eclipse.tracecompass.incubator.scripting.ui.project.handlers.DebugAsElementTypeContributionItem"
+                  class="org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers.DebugAsElementTypeContributionItem"
                   id="org.eclipse.tracecompass.incubator.scripting.ui.command.debug_as_ease_script.dynamic">
             </dynamic>
             <visibleWhen
@@ -123,14 +123,14 @@
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
-            class="org.eclipse.tracecompass.incubator.scripting.ui.project.handlers.ScriptEngineTester"
+            class="org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers.ScriptEngineTester"
             id="org.eclipse.tracecompass.incubator.scripting.ui.engine"
             namespace="org.eclipse.tracecompass.incubator.scripting.ui"
             properties="hasEngine,hasDebugEngine"
             type="java.lang.Object">
       </propertyTester>
       <propertyTester
-            class="org.eclipse.tracecompass.incubator.scripting.ui.project.handlers.InTracingProjectTester"
+            class="org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers.InTracingProjectTester"
             id="org.eclipse.tracecompass.incubator.scripting.ui.intracing.project"
             namespace="org.eclipse.tracecompass.incubator.scripting.ui"
             properties="inTracingProject"
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/DebugAsElementTypeContributionItem.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/DebugAsElementTypeContributionItem.java
index 1bd054522..70b51ca43 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/DebugAsElementTypeContributionItem.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/DebugAsElementTypeContributionItem.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/InTracingProjectTester.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/InTracingProjectTester.java
index c1d40d69a..06c538833 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/InTracingProjectTester.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/InTracingProjectTester.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.core.resources.IFile;
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/LaunchAsEaseScriptHandler.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/LaunchAsEaseScriptHandler.java
index 0252a615a..2fd1ac33b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/LaunchAsEaseScriptHandler.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/LaunchAsEaseScriptHandler.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/LaunchElementTypeContributionItem.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/LaunchElementTypeContributionItem.java
index 542f08587..2b407d877 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/LaunchElementTypeContributionItem.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/LaunchElementTypeContributionItem.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/Messages.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/Messages.java
index 58af19648..f1729a59b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/Messages.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/Messages.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
  *
  */
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.tracecompass.incubator.scripting.ui.project.handlers.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$
     /** Menu entry for run/debug as menu*/
     public static @Nullable String Scripting_RunAsScriptName;
     static {
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/RunAsElementTypeContributionItem.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/RunAsElementTypeContributionItem.java
index e9c3fed2b..16cd8169f 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/RunAsElementTypeContributionItem.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/RunAsElementTypeContributionItem.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/ScriptEngineTester.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/ScriptEngineTester.java
index 6b1a48c75..28f51d819 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/ScriptEngineTester.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/ScriptEngineTester.java
@@ -6,7 +6,7 @@
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
 
 import java.util.Iterator;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/messages.properties b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/messages.properties
index 11309a247..11309a247 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/messages.properties
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/messages.properties
diff --git a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/package-info.java b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/package-info.java
index e521213ce..37b2153b0 100644
--- a/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/scripting/ui/project/handlers/package-info.java
+++ b/analyses/org.eclipse.tracecompass.incubator.scripting.ui/src/org/eclipse/tracecompass/incubator/internal/scripting/ui/project/handlers/package-info.java
@@ -8,4 +8,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.incubator.scripting.ui.project.handlers;
+package org.eclipse.tracecompass.incubator.internal.scripting.ui.project.handlers;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/META-INF/MANIFEST.MF
index 2154b1b5c..4e731f0f6 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/META-INF/MANIFEST.MF
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/META-INF/MANIFEST.MF
@@ -32,17 +32,17 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.datastore.core,
  org.eclipse.tracecompass.incubator.xaf.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.tracecompass.incubator.internal.xaf.ui;x-internal:=true,
+Export-Package: org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.ui;x-internal:=true,
  org.eclipse.tracecompass.incubator.internal.xaf.ui.console;x-internal:=true,
+ org.eclipse.tracecompass.incubator.internal.xaf.ui.handlers;x-internal:=true,
  org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine;x-internal:=true,
- org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend,
- org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder,
- org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint,
- org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception,
- org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable,
- org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils,
- org.eclipse.tracecompass.incubator.xaf.ui.handlers,
- org.eclipse.tracecompass.incubator.xaf.ui.views
+ org.eclipse.tracecompass.incubator.internal.xaf.ui.views;x-internal:=true
 Import-Package: com.google.common.collect,
  org.apache.commons.lang3,
  org.apache.commons.math3.util,
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/plugin.xml b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/plugin.xml
index 81cac785f..05bbd5124 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/plugin.xml
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.linuxtools.tmf.core.analysis">
       <module
-            analysis_module="org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis"
+            analysis_module="org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis"
             applies_experiment="false"
             automatic="false"
             icon="icons/xaf.png"
@@ -37,7 +37,7 @@
          </analysisModuleClass>
       </output>
       <parameterProvider
-            class="org.eclipse.tracecompass.incubator.xaf.ui.handlers.XaFParameterProvider">
+            class="org.eclipse.tracecompass.incubator.internal.xaf.ui.handlers.XaFParameterProvider">
          <analysisId
                id="org.eclipse.tracecompass.xaf.core.statemachine">
          </analysisId>
@@ -56,7 +56,7 @@
          point="org.eclipse.ui.views">
       <view
             category="org.eclipse.linuxtools.lttng2.ui.views.category"
-            class="org.eclipse.tracecompass.incubator.xaf.ui.views.StateMachineInstancesConstraintsView"
+            class="org.eclipse.tracecompass.incubator.internal.xaf.ui.views.StateMachineInstancesConstraintsView"
             icon="icons/xaf.png"
             id="org.eclipse.tracecompass.xaf.core.ui.views.stateMachineInstancesConstraints"
             name="%view.smconstraints"
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/Attributes.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/Attributes.java
index 2b5e8b7a2..a860d2688 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/Attributes.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/Attributes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
 
 /**
  * The attribute names that are used in the state provider
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/BackendState.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/BackendState.java
index 168ba359f..6a96b8ade 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/BackendState.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/BackendState.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
 
 /**
  * To represent a state
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/BackendStateValue.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/BackendStateValue.java
index cecffc81e..b9ea4059a 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/BackendStateValue.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/BackendStateValue.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
 
 /**
  * To represent the state values
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java
index b2450ca20..22d0a9046 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineBackendAnalysis.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
 
 import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java
index 2bfc6908e..7fe243bd9 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/StateMachineProviderEventTypes.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
 
 import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/ThreadInfo.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/ThreadInfo.java
index 30814ac83..3149e3ae5 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/backend/ThreadInfo.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/backend/ThreadInfo.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderEventInfo.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderEventInfo.java
index 6ebb96faa..40a0bc896 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderEventInfo.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderEventInfo.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderEventInfoNameEqualityRunner.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderEventInfoNameEqualityRunner.java
index fc75c5f18..ff92705b4 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderEventInfoNameEqualityRunner.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderEventInfoNameEqualityRunner.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
 
 /**
  * @author Raphaël Beamonte
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderEventInfoRateEqualityRunner.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderEventInfoRateEqualityRunner.java
index 688cf0157..a8ae6e7f9 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderEventInfoRateEqualityRunner.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderEventInfoRateEqualityRunner.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
 
 /**
  * TODO Review this class
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderInstanceGroup.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderInstanceGroup.java
index 03e071ea8..679d182c1 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/BuilderInstanceGroup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/BuilderInstanceGroup.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -27,6 +27,12 @@ import java.util.TreeSet;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsExecutionGraph;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Operator;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableTimer;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstanceGroup;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineNode;
@@ -34,12 +40,6 @@ import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMach
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.StateMachineToDot;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Operator;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableTimer;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.trace.experiment.TmfExperiment;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/EqualityRunner.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/EqualityRunner.java
index 2e94c25ca..100e83f7f 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/EqualityRunner.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/EqualityRunner.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
 
 /**
  * A class representing an equality runner used in the build process
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/SuffixTree.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/SuffixTree.java
index 0bd527865..9db7dfde8 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/builder/SuffixTree.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/builder/SuffixTree.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/Direction.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/Direction.java
index 32e3a21c7..518577c8e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/Direction.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/Direction.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 /**
  * The direction for a constraint
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/Operator.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/Operator.java
index a26100032..9a44c3f89 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/Operator.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/Operator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 /**
  * The operator to apply between the variable
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/StateMachineConstraint.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraint.java
index 1da8ff1aa..fa86622cf 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/StateMachineConstraint.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraint.java
@@ -7,15 +7,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 import java.util.List;
 import java.util.Map;
 
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineVariableException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineVariableException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 
 /**
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/StateMachineConstraintAdaptive.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraintAdaptive.java
index 8cad93fe4..781183e4b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/StateMachineConstraintAdaptive.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StateMachineConstraintAdaptive.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,10 +20,10 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.IntStream;
 
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableCounter;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableCounter;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/Status.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/Status.java
index 178b84baf..abb154e1c 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/Status.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/Status.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 /**
  * Constraint status information
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/StatusValue.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StatusValue.java
index 3614b1e97..230aca105 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/StatusValue.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/StatusValue.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 /**
  * The status of a constraint
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/ValueType.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/ValueType.java
index 04f23e309..751cd646f 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/constraint/ValueType.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/constraint/ValueType.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint;
 
 /**
  * The value type for that constraint
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineNoInvalidCaseException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineNoInvalidCaseException.java
index c8030eb0e..39d17a0f7 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineNoInvalidCaseException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineNoInvalidCaseException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * Exception emitted when no invalid case is found for comparison
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineNoValidCaseException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineNoValidCaseException.java
index 40e56ad94..a14f8914e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineNoValidCaseException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineNoValidCaseException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * Exception emitted when no valid case is found for comparison
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineStateSystemNotFoundException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineStateSystemNotFoundException.java
index 73773a5de..dac2cd559 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineStateSystemNotFoundException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineStateSystemNotFoundException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * Exception emitted when the state machine state system is not found
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineStateSystemTimeRangeException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineStateSystemTimeRangeException.java
index 5a8c08ef8..6fe5100f1 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineStateSystemTimeRangeException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineStateSystemTimeRangeException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * Exception emitted when there is a time range exception
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineTIDNotFoundException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineTIDNotFoundException.java
index 9649fbdb5..ec02e975e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineTIDNotFoundException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineTIDNotFoundException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * Exception emitted when no TID is found for an instance
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineUnexpectedEventException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineUnexpectedEventException.java
index b3b184b54..ab67a1109 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineUnexpectedEventException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineUnexpectedEventException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * Exception emitted when receiving an event that isn't the one we expected
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineVariableException.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineVariableException.java
index 20c7f738f..e8f27fa83 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/exception/StateMachineVariableException.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/exception/StateMachineVariableException.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception;
 
 /**
  * @author Raphaël Beamonte
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariable.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariable.java
index 5123588f8..e0e8668a0 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariable.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariable.java
@@ -7,17 +7,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineVariableException;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineVariableException;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 
 /**
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java
index e4a44243e..6f3d242dc 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableAnalysis.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 
@@ -39,36 +39,36 @@ import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.incubator.internal.xaf.core.Activator;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ActionOnMapKey;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.CpuFrequency;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.CriticalPathState;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ElementProbability;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionDuration;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionDurationSet;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEventList;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionInterval;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionIntervalSet;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionIntervalSetDiff;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.IsiSampleIterator;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ResponsibilityMap;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.State;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineBenchmark;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstanceGroup;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineReport;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineSegment;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.Attributes;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendStateValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.ActionOnMapKey;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.CpuFrequency;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.CriticalPathState;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.ElementProbability;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionDuration;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionDurationSet;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEventList;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionIntervalSet;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionIntervalSetDiff;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionReason;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.IsiSampleIterator;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.ResponsibilityMap;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.State;
 import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraphVisitor;
 import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.CriticalPathAlgorithmBounded;
 import org.eclipse.tracecompass.internal.segmentstore.core.treemap.TreeMapStore;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableComparator.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableComparator.java
index eea48a31d..261fec920 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableComparator.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableComparator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 import java.util.Comparator;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableCounter.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounter.java
index 488240e72..e9e3b641f 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableCounter.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounter.java
@@ -7,37 +7,37 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
 
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Operator;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.ValueType;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineVariableException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.DefaultInterruptionEventRunner;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventGetter;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventRunner;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.ResponsibilityMapGetter;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEvent;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEventList;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionIntervalSetDiff;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ResponsibilityMap;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineReport;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Operator;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.ValueType;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineVariableException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.DefaultInterruptionEventRunner;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventGetter;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventRunner;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.ResponsibilityMapGetter;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEvent;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEventList;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionIntervalSetDiff;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionReason;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.ResponsibilityMap;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableCounterPreempt.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounterPreempt.java
index 366510455..5314d7821 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableCounterPreempt.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounterPreempt.java
@@ -7,15 +7,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 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.xaf.core.statemachine.backend.Attributes;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendStateValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionReason;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.State;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.State;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableCounterSyscalls.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounterSyscalls.java
index 6eb0cbb43..1f4210fe1 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableCounterSyscalls.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableCounterSyscalls.java
@@ -7,15 +7,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 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.xaf.core.statemachine.backend.Attributes;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendStateValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionReason;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.State;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.State;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 
 /**
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableDeadline.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableDeadline.java
index 759e77f5e..7fd6361b2 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableDeadline.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableDeadline.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 import java.util.Arrays;
 import java.util.List;
@@ -16,29 +16,29 @@ import java.util.Map.Entry;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.ValueType;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineVariableException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.DefaultInterruptionEventRunner;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventGetter;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEvent;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEventList;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ResponsibilityMap;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.State;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineReport;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.Attributes;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendStateValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.ValueType;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineUnexpectedEventException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineVariableException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.DefaultInterruptionEventRunner;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventGetter;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEvent;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEventList;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionReason;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.ResponsibilityMap;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.State;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableTimer.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableTimer.java
index 7b1132a7e..03bb0d35f 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableTimer.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableTimer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,6 +18,24 @@ import java.util.Map.Entry;
 
 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.internal.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Operator;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.ValueType;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.exception.StateMachineVariableException;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventRunner;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEvent;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionEventList;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.InterruptionReason;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.ResponsibilityMap;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.State;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils.StateMachineVariableHelpers;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineBenchmark;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstanceGroup;
@@ -25,24 +43,6 @@ import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMach
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendStateValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Operator;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.ValueType;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoInvalidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineNoValidCaseException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineStateSystemTimeRangeException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineTIDNotFoundException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.exception.StateMachineVariableException;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis.InterruptionEventRunner;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEvent;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionEventList;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.InterruptionReason;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.ResponsibilityMap;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.State;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils.StateMachineVariableHelpers;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableTimerCpuTime.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableTimerCpuTime.java
index 649845e2e..574f7179c 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableTimerCpuTime.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableTimerCpuTime.java
@@ -7,9 +7,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.Attributes;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
 
 /**
  * Class that represents a state machine variable of timer class, of cputime
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableTimerWaitBlocked.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableTimerWaitBlocked.java
index 6a0738a0a..fc48afc18 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/StateMachineVariableTimerWaitBlocked.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/StateMachineVariableTimerWaitBlocked.java
@@ -7,9 +7,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable;
 
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.Attributes;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.Attributes;
 
 /**
  * Class that represents a state machine variable of timer class, of waitblocked
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/ActionOnMapKey.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/ActionOnMapKey.java
index 07611bb51..c87ab4924 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/ActionOnMapKey.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/ActionOnMapKey.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 /**
  * Class used to represent an action to be executed on a map key when merging
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/CpuFrequency.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CpuFrequency.java
index c6065f8dc..cb0269769 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/CpuFrequency.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CpuFrequency.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import org.eclipse.tracecompass.common.core.NonNullUtils;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/CriticalPathState.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CriticalPathState.java
index 15779c874..53767b4c7 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/CriticalPathState.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/CriticalPathState.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge;
 import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsWorker;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/ElementProbability.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/ElementProbability.java
index a031083c9..ccb2dab69 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/ElementProbability.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/ElementProbability.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 /**
  * Representation of the probability of a given element considering its computed
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionDuration.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionDuration.java
index ffb23c67a..74aa61e2e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionDuration.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionDuration.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionDurationSet.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionDurationSet.java
index 21962f18c..b1a286850 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionDurationSet.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionDurationSet.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.Collection;
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.Set;
 import java.util.Map.Entry;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Direction;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Direction;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionEvent.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionEvent.java
index 770c45797..309b673f1 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionEvent.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionEvent.java
@@ -7,11 +7,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 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.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionEventList.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionEventList.java
index 60a6ecfd1..33cc65232 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionEventList.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionEventList.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionInterval.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionInterval.java
index e0717b6ce..cb4983215 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionInterval.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionInterval.java
@@ -7,14 +7,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Direction;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Direction;
 
 /**
  * Class linking an interruption reason to an interval
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionIntervalSet.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSet.java
index f8f8ec668..e73816ffc 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionIntervalSet.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSet.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Direction;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Direction;
 
 import com.google.common.collect.HashMultimap;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java
index bfe9ad20a..22a5b5281 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionIntervalSetDiff.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.Collection;
 import java.util.Comparator;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionReason.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionReason.java
index 52df3bf48..d18332716 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionReason.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionReason.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 /**
  * Abstract class to represent an interruption. Derived classes will be used
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionReasonSet.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionReasonSet.java
index 4886cf49a..56a50eb3b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/InterruptionReasonSet.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/InterruptionReasonSet.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/IsiSampleIterator.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/IsiSampleIterator.java
index 8bba36ec7..4cfddce69 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/IsiSampleIterator.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/IsiSampleIterator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/RandomCombinationsIterator.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/RandomCombinationsIterator.java
index fbb26c959..2ad660943 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/RandomCombinationsIterator.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/RandomCombinationsIterator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.Iterator;
 import java.util.Random;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/RandomCombinationsIteratorUnique.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/RandomCombinationsIteratorUnique.java
index 746423d38..20bada1db 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/RandomCombinationsIteratorUnique.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/RandomCombinationsIteratorUnique.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/ResponsibilityMap.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/ResponsibilityMap.java
index b64258ccf..dcc4fbd4b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/ResponsibilityMap.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/ResponsibilityMap.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/State.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/State.java
index 27d8e06f5..bf6f625f6 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/State.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/State.java
@@ -7,10 +7,10 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendState;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.BackendStateValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendState;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.BackendStateValue;
 
 /**
  * Element representing a process State
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/StateMachineVariableHelpers.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/StateMachineVariableHelpers.java
index 3e9a52e42..e41095491 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/StateMachineVariableHelpers.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/StateMachineVariableHelpers.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/UniqueCombinationsIterator.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/UniqueCombinationsIterator.java
index 4463df2e2..f72671609 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/UniqueCombinationsIterator.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/UniqueCombinationsIterator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/UniqueCombinationsIteratorSample.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/UniqueCombinationsIteratorSample.java
index 0e75aa0a3..479f9e8ea 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/core/statemachine/variable/utils/UniqueCombinationsIteratorSample.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/core/statemachine/variable/utils/UniqueCombinationsIteratorSample.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.utils;
+package org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.utils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/ManageXaFParametersDialog.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/ManageXaFParametersDialog.java
index 8f68f872d..eed57c33e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/ManageXaFParametersDialog.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/ManageXaFParametersDialog.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.ui.handlers;
+package org.eclipse.tracecompass.incubator.internal.xaf.ui.handlers;
 
 import java.io.File;
 import java.io.IOException;
@@ -60,8 +60,8 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/Messages.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/Messages.java
index 9738668c4..6f289a812 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/Messages.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/Messages.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.ui.handlers;
+package org.eclipse.tracecompass.incubator.internal.xaf.ui.handlers;
 
 import org.eclipse.osgi.util.NLS;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/XaFParameterProvider.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/XaFParameterProvider.java
index ab4e23d29..1f92ff538 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/XaFParameterProvider.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/XaFParameterProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.ui.handlers;
+package org.eclipse.tracecompass.incubator.internal.xaf.ui.handlers;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/messages.properties b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/messages.properties
index efe4a412a..efe4a412a 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/handlers/messages.properties
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/handlers/messages.properties
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineAnalysis.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineAnalysis.java
index 33b9a562b..153b7c624 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineAnalysis.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineAnalysis.java
@@ -48,11 +48,11 @@ import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsExecuti
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.AbstractSegmentStoreAnalysisModule;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.builder.BuilderInstanceGroup;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.Activator;
+import org.eclipse.tracecompass.incubator.internal.xaf.ui.handlers.XaFParameterProvider;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.builder.BuilderInstanceGroup;
-import org.eclipse.tracecompass.incubator.xaf.ui.handlers.XaFParameterProvider;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java
index 33dfa3dbb..5edc8e79e 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstance.java
@@ -19,12 +19,12 @@ import java.util.stream.Collectors;
 
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Status;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StatusValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineUtils.TimestampInterval;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Status;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StatusValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java
index 54e57f7fc..19b08634b 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineInstanceGroup.java
@@ -21,14 +21,14 @@ import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.analysis.os.linux.core.execution.graph.OsExecutionGraph;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Status;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StatusValue;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis;
 import org.eclipse.tracecompass.incubator.internal.xaf.ui.statemachine.StateMachineInstance.InstanceStepInformation;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.backend.StateMachineBackendAnalysis;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Status;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StatusValue;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis;
 import org.eclipse.tracecompass.internal.segmentstore.core.treemap.TreeMapStore;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineNode.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineNode.java
index e54cd9075..6ab68f82f 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineNode.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineNode.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 
 /**
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineReport.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineReport.java
index 56c215d0a..c2247c562 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineReport.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineReport.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariableAnalysis;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariableAnalysis;
 import org.eclipse.ui.console.MessageConsoleStream;
 
 import com.google.common.base.Strings;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineTransition.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineTransition.java
index a327d773d..75803c8c0 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineTransition.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineTransition.java
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java
index c9edf7b7d..2935d2b57 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/statemachine/StateMachineUtils.java
@@ -32,11 +32,11 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.Operator;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraint;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.constraint.ValueType;
-import org.eclipse.tracecompass.incubator.xaf.core.statemachine.variable.StateMachineVariable;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.Operator;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraint;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.StateMachineConstraintAdaptive;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.constraint.ValueType;
+import org.eclipse.tracecompass.incubator.internal.xaf.core.statemachine.variable.StateMachineVariable;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/views/StateMachineInstancesConstraintsTableViewer.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/views/StateMachineInstancesConstraintsTableViewer.java
index 04e058447..f234b8e16 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/views/StateMachineInstancesConstraintsTableViewer.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/views/StateMachineInstancesConstraintsTableViewer.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.ui.views;
+package org.eclipse.tracecompass.incubator.internal.xaf.ui.views;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/views/StateMachineInstancesConstraintsView.java b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/views/StateMachineInstancesConstraintsView.java
index f8f1b1473..763afc4d3 100644
--- a/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/xaf/ui/views/StateMachineInstancesConstraintsView.java
+++ b/analyses/org.eclipse.tracecompass.incubator.xaf.ui/src/org/eclipse/tracecompass/incubator/internal/xaf/ui/views/StateMachineInstancesConstraintsView.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.xaf.ui.views;
+package org.eclipse.tracecompass.incubator.internal.xaf.ui.views;
 
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableView;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/META-INF/MANIFEST.MF
index cb94e8468..d38fc66fd 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/META-INF/MANIFEST.MF
@@ -17,5 +17,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.incubator.traceevent.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.incubator.internal.atrace.core;x-friends:="org.eclipse.tracecompass.incubator.atrace.core.tests",
+ org.eclipse.tracecompass.incubator.internal.atrace.event;x-internal:=true,
  org.eclipse.tracecompass.incubator.internal.atrace.trace;x-friends:="org.eclipse.tracecompass.incubator.atrace.core.tests"
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.atrace.core
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/atrace/event/IAtraceConstants.java b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/event/IAtraceConstants.java
index 62bc55b77..5759119fa 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/atrace/event/IAtraceConstants.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/event/IAtraceConstants.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.atrace.event;
+package org.eclipse.tracecompass.incubator.internal.atrace.event;
 
 import java.util.regex.Pattern;
 
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/atrace/event/SystraceProcessDumpEvent.java b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/event/SystraceProcessDumpEvent.java
index e311c2551..81ae8c890 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/atrace/event/SystraceProcessDumpEvent.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/event/SystraceProcessDumpEvent.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.atrace.event;
+package org.eclipse.tracecompass.incubator.internal.atrace.event;
 
 import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.jdt.annotation.NonNull;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/atrace/event/SystraceProcessDumpEventField.java b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/event/SystraceProcessDumpEventField.java
index 23a9f61ff..f22ff70a1 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/atrace/event/SystraceProcessDumpEventField.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/event/SystraceProcessDumpEventField.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.tracecompass.incubator.atrace.event;
+package org.eclipse.tracecompass.incubator.internal.atrace.event;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/trace/ATrace.java b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/trace/ATrace.java
index fcebdafbb..b488f05d9 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/trace/ATrace.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.atrace.core/src/org/eclipse/tracecompass/incubator/internal/atrace/trace/ATrace.java
@@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.incubator.atrace.event.IAtraceConstants;
-import org.eclipse.tracecompass.incubator.atrace.event.SystraceProcessDumpEvent;
-import org.eclipse.tracecompass.incubator.atrace.event.SystraceProcessDumpEventField;
 import org.eclipse.tracecompass.incubator.internal.atrace.core.Activator;
+import org.eclipse.tracecompass.incubator.internal.atrace.event.IAtraceConstants;
+import org.eclipse.tracecompass.incubator.internal.atrace.event.SystraceProcessDumpEvent;
+import org.eclipse.tracecompass.incubator.internal.atrace.event.SystraceProcessDumpEventField;
 import org.eclipse.tracecompass.incubator.internal.ftrace.core.event.GenericFtraceField;
 import org.eclipse.tracecompass.incubator.internal.ftrace.core.event.IGenericFtraceConstants;
 import org.eclipse.tracecompass.incubator.internal.ftrace.core.trace.GenericFtrace;