diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 7ef121a698ca..1fad24c44e72 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -183,6 +183,7 @@
             "spotbugs": "false",
         },
 
+
         "com.oracle.svm.core.jdk8": {
             "subDir": "src",
             "sourceDirs": ["src"],
@@ -195,26 +196,49 @@
         "com.oracle.svm.core.jdk11": {
             "subDir": "src",
             "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
+            "dependencies": [
+                "com.oracle.svm.core.jfr",
+            ],
             "requires" : [
+                "jdk.jfr",
+                "jdk.management",
                 "java.logging",
                 "jdk.unsupported",
                 "java.compiler",
             ],
             "requiresConcealed" : {
                 "java.base" : [
+                    "jdk.internal.event",
                     "jdk.internal.module",
                     "jdk.internal.reflect",
                     "jdk.internal.misc",
                     "jdk.internal.logger",
                     "jdk.internal.loader",
+                    "jdk.internal.org.xml.sax.helpers",
                     "sun.util.resources",
+                    "jdk.internal.util.xml",
+                    "jdk.internal.util.xml.impl",
                     "sun.text.spi",
                     "jdk.internal.perf",
                     "sun.util.locale.provider",
                     "jdk.internal.loader"
                 ],
+                "jdk.jfr": [
+                    "jdk.jfr.internal",
+                    "jdk.jfr.internal.consumer",
+                    "jdk.jfr.internal.jfc",
+                    "jdk.jfr.internal.handlers",
+                    "jdk.jfr.events"
+                ],
+                "jdk.internal.vm.ci": [
+                    "jdk.vm.ci.meta",
+                    "jdk.vm.ci.code",
+                    "jdk.vm.ci.hotspot"
+                ],
             },
+            "annotationProcessors": [
+                "compiler:GRAAL_PROCESSOR",
+            ],
             "javaCompliance": "11+",
             "checkstyle": "com.oracle.svm.core",
             "workingSets": "SVM",
@@ -428,10 +452,18 @@
                 "com.oracle.svm.hosted",
                 "com.oracle.svm.core.jdk11"
             ],
-            "requires" : ["java.instrument"],
+            "requires" : [
+                "java.instrument",
+                "jdk.jfr",
+                "jdk.unsupported",
+            ],
             "requiresConcealed" : {
                 "jdk.internal.vm.ci": ["jdk.vm.ci.meta"],
                 "java.base" : ["jdk.internal.module"],
+                "jdk.jfr" : [
+                    "jdk.jfr.internal",
+                    "jdk.jfr.internal.jfc",
+                ]
             },
             "javaCompliance": "11+",
             "checkstyle" : "com.oracle.svm.hosted",
@@ -570,40 +602,14 @@
             "spotbugs": "false",
         },
 
-        "com.oracle.svm.jfr": {
+        "com.oracle.svm.core.jfr": {
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
-                "com.oracle.svm.hosted",
+                "com.oracle.svm.core",
             ],
             "checkstyle": "com.oracle.svm.core",
-            "javaCompliance": "11+",
-            "requires": [
-                "jdk.jfr",
-                "jdk.management",
-                "jdk.unsupported"
-            ],
-            "requiresConcealed": {
-                "jdk.jfr": [
-                    "jdk.jfr.internal",
-                    "jdk.jfr.internal.consumer",
-                    "jdk.jfr.internal.jfc",
-                    "jdk.jfr.internal.handlers",
-                    "jdk.jfr.events"
-                ],
-                "jdk.internal.vm.ci": [
-                    "jdk.vm.ci.meta",
-                    "jdk.vm.ci.code",
-                    "jdk.vm.ci.hotspot"
-                ],
-                "java.base": [
-                    "jdk.internal.event",
-                    "jdk.internal.misc",
-                    "jdk.internal.util.xml",
-                    "jdk.internal.util.xml.impl",
-                    "jdk.internal.org.xml.sax.helpers"
-                ]
-            },
+            "javaCompliance": "8+",
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
             ],
@@ -1079,7 +1085,6 @@
                 "com.oracle.svm.core.genscavenge",
                 "com.oracle.svm.core.containers",
                 "com.oracle.svm.jni",
-                "com.oracle.svm.jfr",
                 "com.oracle.svm.reflect",
                 "com.oracle.svm.methodhandles"
             ],
@@ -1100,7 +1105,7 @@
                     "com.oracle.svm.core.snippets", # Uses of com.oracle.svm.core.snippets.KnownIntrinsics
                     "com.oracle.svm.core", # Uses of com.oracle.svm.core.TypeResult
                     "com.oracle.svm.core.util", # Uses of com.oracle.svm.core.util.VMError
-                    "com.oracle.svm.jfr", # Uses of com.oracle.svm.jfr.JfrEnabled
+                    "com.oracle.svm.core.jdk11.jfr", # Uses of com.oracle.svm.core.jdk11.jfr.JfrEnabled
                     "com.oracle.svm.hosted                        to java.base",
                     "com.oracle.svm.hosted.agent                  to java.instrument",
                     "com.oracle.svm.truffle.api                   to org.graalvm.truffle",
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBuffer.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBuffer.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBuffer.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBuffer.java
index 82360534b247..10b669efc7b3 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBuffer.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBuffer.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawFieldOffset;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBufferAccess.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBufferAccess.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBufferAccess.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBufferAccess.java
index b5db581125ba..8d5262c9974c 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBufferAccess.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBufferAccess.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBuffers.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBuffers.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBuffers.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBuffers.java
index 3da75faa5b2a..299a5eaa5d1f 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrBuffers.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrBuffers.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.c.struct.RawPointerTo;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrChunkWriter.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrChunkWriter.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrChunkWriter.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrChunkWriter.java
index 2ed1c338dab1..2bd5d0187eab 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrChunkWriter.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrChunkWriter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.locks.ReentrantLock;
@@ -42,7 +42,7 @@
 import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.thread.VMOperationControl;
 import com.oracle.svm.core.thread.VMThreads;
-import com.oracle.svm.jfr.traceid.JfrTraceIdEpoch;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceIdEpoch;
 
 /**
  * This class is used when writing the in-memory JFR data to a file. For all operations, except
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrConstantPool.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrConstantPool.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrConstantPool.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrConstantPool.java
index 8127adcd8faa..f6e4db387bf2 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrConstantPool.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrConstantPool.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEnabled.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEnabled.java
index cfa97353c7a0..4f9916b9fd29 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEnabled.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.util.function.BooleanSupplier;
 
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEventSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEventSupportJDK11OrLater.java
new file mode 100644
index 000000000000..fd81de7e91cf
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEventSupportJDK11OrLater.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.jdk11.jfr;
+
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.ImageSingletons;
+
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.jfr.JfrEventSupport;
+
+/**
+ * Jfr event support for supported JDK versions.
+ */
+final class JfrEventSupportJDK11OrLater extends JfrEventSupport {
+}
+
+@AutomaticFeature
+final class JfrFeatureJDK11OrLater implements Feature {
+    @Override
+    public boolean isInConfiguration(IsInConfigurationAccess access) {
+        return JavaVersionUtil.JAVA_SPEC >= 11;
+    }
+
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        ImageSingletons.add(JfrEventSupport.class, new JfrEventSupportJDK11OrLater());
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventWriterAccess.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEventWriterAccess.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventWriterAccess.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEventWriterAccess.java
index dcafac1cb334..972cd3e61b26 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventWriterAccess.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEventWriterAccess.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 //Checkstyle: allow reflection
 import java.lang.reflect.Field;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEvents.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEvents.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEvents.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEvents.java
index c685a30f5cee..6fdd0d5f33e6 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEvents.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrEvents.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFrameType.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrFrameType.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFrameType.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrFrameType.java
index 6efce2d29d42..9c221bb08f4c 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFrameType.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrFrameType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFrameTypeSerializer.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrFrameTypeSerializer.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFrameTypeSerializer.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrFrameTypeSerializer.java
index 669339b0ff8e..16028cfef88b 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFrameTypeSerializer.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrFrameTypeSerializer.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrGlobalMemory.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrGlobalMemory.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrGlobalMemory.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrGlobalMemory.java
index b848acf02876..053148c7cba2 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrGlobalMemory.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrGlobalMemory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrJavaEvents.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrJavaEvents.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrJavaEvents.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrJavaEvents.java
index 47010d2e2a8d..25c00bc704d3 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrJavaEvents.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrJavaEvents.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrManager.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrManager.java
similarity index 96%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrManager.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrManager.java
index 54bf41218a86..cbcd0c90e865 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrManager.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrManager.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -44,13 +44,13 @@
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.util.UserError.UserException;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.jfr.events.ClassLoadingStatistics;
-import com.oracle.svm.jfr.events.InitialEnvironmentVariable;
-import com.oracle.svm.jfr.events.InitialSystemProperty;
-import com.oracle.svm.jfr.events.JVMInformation;
-import com.oracle.svm.jfr.events.JavaThreadStatistics;
-import com.oracle.svm.jfr.events.OSInformation;
-import com.oracle.svm.jfr.events.PhysicalMemory;
+import com.oracle.svm.core.jdk11.jfr.events.ClassLoadingStatistics;
+import com.oracle.svm.core.jdk11.jfr.events.InitialEnvironmentVariable;
+import com.oracle.svm.core.jdk11.jfr.events.InitialSystemProperty;
+import com.oracle.svm.core.jdk11.jfr.events.JVMInformation;
+import com.oracle.svm.core.jdk11.jfr.events.JavaThreadStatistics;
+import com.oracle.svm.core.jdk11.jfr.events.OSInformation;
+import com.oracle.svm.core.jdk11.jfr.events.PhysicalMemory;
 
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.Recording;
@@ -74,11 +74,11 @@ public JfrManager() {
     }
 
     @Fold
-    static JfrManager get() {
+    public static JfrManager get() {
         return ImageSingletons.lookup(JfrManager.class);
     }
 
-    Runnable startupHook() {
+    public Runnable startupHook() {
         return () -> {
             parseFlightRecorderLogging(SubstrateOptions.FlightRecorderLogging.getValue());
             if (SubstrateOptions.FlightRecorder.getValue()) {
@@ -88,7 +88,7 @@ Runnable startupHook() {
         };
     }
 
-    Runnable shutdownHook() {
+    public Runnable shutdownHook() {
         return () -> {
             if (SubstrateOptions.FlightRecorder.getValue()) {
                 // Everything should already have been torn down by JVM.destroyJFR(), which is
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventSetting.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventSetting.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventSetting.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventSetting.java
index fad3fcb4900d..13330289dc8a 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventSetting.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventSetting.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriter.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriter.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriter.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriter.java
index 10e0758be897..55e7a9c48546 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriter.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriterData.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriterData.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriterData.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriterData.java
index d695776dc87b..4f48ba172b6f 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriterData.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriterData.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawStructure;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriterDataAccess.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriterDataAccess.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriterDataAccess.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriterDataAccess.java
index 2559714f410e..bae7800be528 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrNativeEventWriterDataAccess.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrNativeEventWriterDataAccess.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrOptionSet.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrOptionSet.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrOptionSet.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrOptionSet.java
index c9f82c50b79a..7f9b3f772e4d 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrOptionSet.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrOptionSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrRecorderThread.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrRecorderThread.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrRecorderThread.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrRecorderThread.java
index 179fa8e0782d..5eaf25c32dff 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrRecorderThread.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrRecorderThread.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.word.UnsignedWord;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSerializerSupport.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrSerializerSupport.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSerializerSupport.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrSerializerSupport.java
index 47e8f9676b2d..105a2e01eb2b 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSerializerSupport.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrSerializerSupport.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.util.Arrays;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrSymbolRepository.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrSymbolRepository.java
index a1f82973ebc7..53a935e8cff9 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrSymbolRepository.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.nio.charset.StandardCharsets;
 
@@ -45,7 +45,7 @@
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.c.struct.PinnedObjectField;
 import com.oracle.svm.core.heap.Heap;
-import com.oracle.svm.jfr.traceid.JfrTraceIdEpoch;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceIdEpoch;
 
 /**
  * In Native Image, we use {@link java.lang.String} objects that live in the image heap as symbols.
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrThreadLocal.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrThreadLocal.java
index 06cac6b8d089..4ef4d7ed7c2a 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrThreadLocal.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTicks.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTicks.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTicks.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTicks.java
index c73413176c66..c47aa51cdc5c 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTicks.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTicks.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTypeRepository.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTypeRepository.java
index 17ee27da460a..d4ea15b916bd 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTypeRepository.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,7 +35,7 @@
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.jdk.HiddenClassSupport;
-import com.oracle.svm.jfr.traceid.JfrTraceId;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceId;
 
 /**
  * Repository that collects and writes used classes, packages, modules, and classloaders.
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypes.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTypes.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypes.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTypes.java
index 4461970b7181..e5f4300b69e3 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypes.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.TypeLibrary;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrUnlockedChunkWriter.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrUnlockedChunkWriter.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrUnlockedChunkWriter.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrUnlockedChunkWriter.java
index 8eb3f036e262..890670dc8068 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrUnlockedChunkWriter.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/JfrUnlockedChunkWriter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 /**
  * An interface that collects all {@link JfrChunkWriter} methods that may be called without holding
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/SubstrateJVM.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/SubstrateJVM.java
index 585932ec5494..c18dfed6e0ee 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/SubstrateJVM.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 //Checkstyle: allow reflection
 import java.lang.reflect.Field;
@@ -41,7 +41,7 @@
 import com.oracle.svm.core.thread.JavaVMOperation;
 import com.oracle.svm.core.thread.ThreadListener;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.jfr.logging.JfrLogging;
+import com.oracle.svm.core.jdk11.jfr.logging.JfrLogging;
 
 import jdk.jfr.Configuration;
 import jdk.jfr.internal.EventWriter;
@@ -51,7 +51,7 @@
 /**
  * Manager class that handles most JFR Java API, see {@link Target_jdk_jfr_internal_JVM}.
  */
-class SubstrateJVM {
+public class SubstrateJVM {
     private final List<Configuration> knownConfigurations;
     private final JfrOptionSet options;
     private final JfrNativeEventSetting[] eventSettings;
@@ -74,7 +74,7 @@ class SubstrateJVM {
     private byte[] metadataDescriptor;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    SubstrateJVM(List<Configuration> configurations) {
+    public SubstrateJVM(List<Configuration> configurations) {
         this.knownConfigurations = configurations;
 
         options = new JfrOptionSet();
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_EventHandlerCreator.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_EventHandlerCreator.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_EventHandlerCreator.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_EventHandlerCreator.java
index 62c1c3f291eb..7100b3e60b9a 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_EventHandlerCreator.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_EventHandlerCreator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_EventWriter.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_EventWriter.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_EventWriter.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_EventWriter.java
index 0c9ce770dc23..4f59f52e5045 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_EventWriter.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_EventWriter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.TargetClass;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_JVM.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_JVM.java
index 2cf9121df458..0bdb7224603e 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_JVM.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.util.List;
 
@@ -40,7 +40,7 @@
 import com.oracle.svm.core.jdk.JDK15OrLater;
 import com.oracle.svm.core.jdk.JDK16OrEarlier;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.jfr.traceid.JfrTraceId;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceId;
 
 import jdk.jfr.Event;
 import jdk.jfr.internal.EventWriter;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_Options.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_Options.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_Options.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_Options.java
index e4475ba763ac..026a5373e3ee 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_Options.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_Options.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_Repository.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_Repository.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_Repository.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_Repository.java
index a1606b7581ba..332e88cf60e6 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_Repository.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_Repository.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.Alias;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_SecuritySupport.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_SecuritySupport.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_SecuritySupport.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_SecuritySupport.java
index feceb9e0e579..d3bf14986cf5 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_SecuritySupport.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_SecuritySupport.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.util.List;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_StringPool.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_StringPool.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_StringPool.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_StringPool.java
index 755de3729218..b7eff65c6e52 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_StringPool.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_StringPool.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_instrument_JDKEvents.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_instrument_JDKEvents.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_instrument_JDKEvents.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_instrument_JDKEvents.java
index c703d51c73e2..89dd06708998 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_instrument_JDKEvents.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_instrument_JDKEvents.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_jfc_JFC.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_jfc_JFC.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_jfc_JFC.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_jfc_JFC.java
index 81cbb8039ae7..b15d37737ebd 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_jfc_JFC.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_jfc_JFC.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_jfc_JFCParser.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_jfc_JFCParser.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_jfc_JFCParser.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_jfc_JFCParser.java
index d6be5af8ef95..890d13fc3c6d 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_jfc_JFCParser.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/Target_jdk_jfr_internal_jfc_JFCParser.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.core.jdk11.jfr;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/ClassLoadingStatistics.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/ClassLoadingStatistics.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/ClassLoadingStatistics.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/ClassLoadingStatistics.java
index c49bd16e1439..36b883397d0b 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/ClassLoadingStatistics.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/ClassLoadingStatistics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import com.oracle.svm.core.heap.Heap;
 import jdk.jfr.Category;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/InitialEnvironmentVariable.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/InitialEnvironmentVariable.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/InitialEnvironmentVariable.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/InitialEnvironmentVariable.java
index f4e1c7c46eb6..fc0439a14365 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/InitialEnvironmentVariable.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/InitialEnvironmentVariable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import java.util.Map;
 import jdk.jfr.Category;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/InitialSystemProperty.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/InitialSystemProperty.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/InitialSystemProperty.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/InitialSystemProperty.java
index d374b07ffad3..24814165a1ec 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/InitialSystemProperty.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/InitialSystemProperty.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import java.util.Properties;
 import jdk.jfr.Category;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/JVMInformation.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/JVMInformation.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/JVMInformation.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/JVMInformation.java
index 96b7988dff41..aa93527f0c63 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/JVMInformation.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/JVMInformation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import com.oracle.svm.core.JavaMainWrapper;
 import java.lang.management.ManagementFactory;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/JavaThreadStatistics.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/JavaThreadStatistics.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/JavaThreadStatistics.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/JavaThreadStatistics.java
index 75c63216c534..ffb5b7eaa3b1 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/JavaThreadStatistics.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/JavaThreadStatistics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/OSInformation.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/OSInformation.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/OSInformation.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/OSInformation.java
index 2bd49eac77f8..6ac997e820dd 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/OSInformation.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/OSInformation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import jdk.jfr.Category;
 import jdk.jfr.Event;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/PhysicalMemory.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/PhysicalMemory.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/PhysicalMemory.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/PhysicalMemory.java
index 3589b0efb595..24eacd0d0d24 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/events/PhysicalMemory.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/events/PhysicalMemory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.events;
+package com.oracle.svm.core.jdk11.jfr.events;
 
 import jdk.jfr.Category;
 import jdk.jfr.DataAmount;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogConfiguration.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogConfiguration.java
index 836ef94d2494..5f215afb2233 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogConfiguration.java
@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.logging;
+package com.oracle.svm.core.jdk11.jfr.logging;
 
 import java.util.EnumMap;
 import java.util.EnumSet;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogTag.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogTag.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogTag.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogTag.java
index 6b99c4e51559..64ee31401f7f 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogTag.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogTag.java
@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.logging;
+package com.oracle.svm.core.jdk11.jfr.logging;
 
 /**
  * This enum contains all log tags that are in at least one {@link jdk.jfr.internal.LogTag}. This
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogging.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogging.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogging.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogging.java
index 3c7e553fc9e3..e354e53fe32c 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogging.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/JfrLogging.java
@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.logging;
+package com.oracle.svm.core.jdk11.jfr.logging;
 
 import java.util.Set;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/Target_jdk_jfr_internal_LogTag.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/Target_jdk_jfr_internal_LogTag.java
similarity index 95%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/Target_jdk_jfr_internal_LogTag.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/Target_jdk_jfr_internal_LogTag.java
index 0bd90c9bf6c3..047eb9f12a1f 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/Target_jdk_jfr_internal_LogTag.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/logging/Target_jdk_jfr_internal_LogTag.java
@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr.logging;
+package com.oracle.svm.core.jdk11.jfr.logging;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -31,7 +31,7 @@
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.jfr.JfrEnabled;
+import com.oracle.svm.core.jdk11.jfr.JfrEnabled;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceId.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceId.java
similarity index 99%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceId.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceId.java
index 34ee77505af9..875fbde2e1ac 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceId.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceId.java
@@ -24,7 +24,7 @@
  * questions.
  */
 
-package com.oracle.svm.jfr.traceid;
+package com.oracle.svm.core.jdk11.jfr.traceid;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceIdEpoch.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceIdEpoch.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceIdEpoch.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceIdEpoch.java
index ff76ed270456..dee3782f1e92 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceIdEpoch.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceIdEpoch.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.jfr.traceid;
+package com.oracle.svm.core.jdk11.jfr.traceid;
 
 //Checkstyle: allow reflection
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceIdMap.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceIdMap.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceIdMap.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceIdMap.java
index 0a46d193b236..b91487bcb0aa 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/traceid/JfrTraceIdMap.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/jfr/traceid/JfrTraceIdMap.java
@@ -24,7 +24,7 @@
  * questions.
  */
 
-package com.oracle.svm.jfr.traceid;
+package com.oracle.svm.core.jdk11.jfr.traceid;
 
 import java.util.Arrays;
 
diff --git a/substratevm/src/com.oracle.svm.core.jfr/src/com/oracle/svm/core/jfr/JfrEventSupport.java b/substratevm/src/com.oracle.svm.core.jfr/src/com/oracle/svm/core/jfr/JfrEventSupport.java
new file mode 100644
index 000000000000..ca8069c806bc
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core.jfr/src/com/oracle/svm/core/jfr/JfrEventSupport.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.jfr;
+
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.ImageSingletons;
+
+import com.oracle.svm.core.annotate.AutomaticFeature;
+
+/**
+ * JfrEventSupport provides native JFR event support to SubstractJVM.
+ */
+public abstract class JfrEventSupport {
+    @Fold
+    public static JfrEventSupport singleton() {
+        return ImageSingletons.lookup(JfrEventSupport.class);
+    }
+}
+
+/**
+ * Placeholder implementation for old JDK version that do not have JFR support.
+ */
+final class JfrEventSupportBeforeJDK11 extends JfrEventSupport {
+}
+
+@AutomaticFeature
+final class JfrFeatureBeforeJDK11 implements Feature {
+    @Override
+    public boolean isInConfiguration(IsInConfigurationAccess access) {
+        return JavaVersionUtil.JAVA_SPEC < 11;
+    }
+
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        ImageSingletons.add(JfrEventSupport.class, new JfrEventSupportBeforeJDK11());
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/jfr/JfrEventSubstitution.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java
rename to substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/jfr/JfrEventSubstitution.java
index b44f203846d1..c043838a5d20 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/jfr/JfrEventSubstitution.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.hosted.jdk11.jfr;
 
 //Checkstyle: allow reflection
 
@@ -37,6 +37,7 @@
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
+import com.oracle.svm.core.jdk11.jfr.JfrJavaEvents;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.c.GraalAccess;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/jfr/JfrFeature.java
similarity index 94%
rename from substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFeature.java
rename to substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/jfr/JfrFeature.java
index 2b788a86d275..8f1bd6bf6360 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/jfr/JfrFeature.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.jfr;
+package com.oracle.svm.hosted.jdk11.jfr;
 
 //Checkstyle: allow reflection
 
@@ -49,10 +49,15 @@
 import com.oracle.svm.core.thread.ThreadListenerSupport;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl;
-import com.oracle.svm.jfr.events.ClassLoadingStatistics;
-import com.oracle.svm.jfr.traceid.JfrTraceId;
-import com.oracle.svm.jfr.traceid.JfrTraceIdEpoch;
-import com.oracle.svm.jfr.traceid.JfrTraceIdMap;
+import com.oracle.svm.core.jdk11.jfr.JfrEnabled;
+import com.oracle.svm.core.jdk11.jfr.JfrFrameTypeSerializer;
+import com.oracle.svm.core.jdk11.jfr.JfrManager;
+import com.oracle.svm.core.jdk11.jfr.JfrSerializerSupport;
+import com.oracle.svm.core.jdk11.jfr.SubstrateJVM;
+import com.oracle.svm.core.jdk11.jfr.events.ClassLoadingStatistics;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceId;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceIdEpoch;
+import com.oracle.svm.core.jdk11.jfr.traceid.JfrTraceIdMap;
 import com.oracle.svm.util.ModuleSupport;
 
 import jdk.jfr.Configuration;
diff --git a/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/jfr/JFRTest.java b/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/jfr/JFRTest.java
index d41a0ac01a2c..09c05063bbf1 100644
--- a/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/jfr/JFRTest.java
+++ b/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/jfr/JFRTest.java
@@ -29,7 +29,7 @@
 import org.graalvm.nativeimage.ImageInfo;
 import org.junit.BeforeClass;
 
-import com.oracle.svm.jfr.JfrEnabled;
+import com.oracle.svm.core.jdk11.jfr.JfrEnabled;
 
 /** Base class for JFR unit tests. */
 public class JFRTest {