diff --git a/application/coverage/pom.xml b/application/coverage/pom.xml
index b86a865921..60c8f78fb7 100644
--- a/application/coverage/pom.xml
+++ b/application/coverage/pom.xml
@@ -207,11 +207,6 @@
org.openjdk.jmc.ide.ui
${project.version}
-
- org.openjdk.jmc
- org.openjdk.jmc.joverflow
- ${project.version}
-
org.openjdk.jmc
org.openjdk.jmc.joverflow.ui
@@ -314,12 +309,6 @@
test
${project.version}
-
- org.openjdk.jmc
- org.openjdk.jmc.joverflow.test
- test
- ${project.version}
-
org.openjdk.jmc
org.openjdk.jmc.rjmx.services.jfr.test
diff --git a/application/org.openjdk.jmc.joverflow/.classpath b/application/org.openjdk.jmc.joverflow/.classpath
deleted file mode 100644
index c5fea9ef27..0000000000
--- a/application/org.openjdk.jmc.joverflow/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/org.openjdk.jmc.joverflow/.project b/application/org.openjdk.jmc.joverflow/.project
deleted file mode 100644
index 31c5b54131..0000000000
--- a/application/org.openjdk.jmc.joverflow/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.openjdk.jmc.joverflow
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/application/pom.xml b/application/pom.xml
index f96e309eeb..72b8317e36 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -95,7 +95,6 @@
org.openjdk.jmc.ide.jdt
org.openjdk.jmc.ide.launch
org.openjdk.jmc.ide.ui
- org.openjdk.jmc.joverflow
org.openjdk.jmc.joverflow.ui
org.openjdk.jmc.osgi.extension
org.openjdk.jmc.pde
@@ -171,6 +170,11 @@
jdp
${revision}${changelist}
+
+ org.openjdk.jmc
+ joverflow
+ ${revision}${changelist}
+
diff --git a/application/tests/org.openjdk.jmc.joverflow.test/.classpath b/application/tests/org.openjdk.jmc.joverflow.test/.classpath
deleted file mode 100644
index e16ec5b08d..0000000000
--- a/application/tests/org.openjdk.jmc.joverflow.test/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/tests/org.openjdk.jmc.joverflow.test/.project b/application/tests/org.openjdk.jmc.joverflow.test/.project
deleted file mode 100644
index b0ea5c65f0..0000000000
--- a/application/tests/org.openjdk.jmc.joverflow.test/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.openjdk.jmc.joverflow.test
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF
deleted file mode 100644
index a674564237..0000000000
--- a/application/tests/org.openjdk.jmc.joverflow.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JOverFlow Test
-Bundle-SymbolicName: org.openjdk.jmc.joverflow.test;singleton:=true
-Bundle-Version: 10.0.0.qualifier
-Bundle-Vendor: Oracle Corporation
-Fragment-Host: org.openjdk.jmc.joverflow
-Bundle-RequiredExecutionEnvironment: JavaSE-21
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.junit
-Automatic-Module-Name: org.openjdk.jmc.joverflow.test
-
diff --git a/application/tests/org.openjdk.jmc.joverflow.test/build.properties b/application/tests/org.openjdk.jmc.joverflow.test/build.properties
deleted file mode 100644
index 4d3712df07..0000000000
--- a/application/tests/org.openjdk.jmc.joverflow.test/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# The contents of this file are subject to the terms of either the Universal Permissive License
-# v 1.0 as shown at https://oss.oracle.com/licenses/upl
-#
-# or the following license:
-#
-# Redistribution and use in source and binary forms, with or without modification, are permitted
-# provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of conditions
-# and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list of
-# conditions and the following disclaimer in the documentation and/or other materials provided with
-# the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used to
-# endorse or promote products derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-source.. = src/test/java/
-output.. = target/test-classes/
-bin.includes = META-INF/,\
- .
-pde.match.rule.bundle=compatible
diff --git a/application/tests/pom.xml b/application/tests/pom.xml
index f46bfe5b01..7c01a1a7e5 100644
--- a/application/tests/pom.xml
+++ b/application/tests/pom.xml
@@ -1,6 +1,6 @@
diff --git a/application/org.openjdk.jmc.joverflow/pom.xml b/core/org.openjdk.jmc.joverflow/pom.xml
similarity index 87%
rename from application/org.openjdk.jmc.joverflow/pom.xml
rename to core/org.openjdk.jmc.joverflow/pom.xml
index 31fc2a7c02..0417f3e740 100644
--- a/application/org.openjdk.jmc.joverflow/pom.xml
+++ b/core/org.openjdk.jmc.joverflow/pom.xml
@@ -1,6 +1,6 @@