diff --git a/bin/nashorn/runopt.sh b/bin/nashorn/runopt.sh index bc9909572..c20c0386c 100644 --- a/bin/nashorn/runopt.sh +++ b/bin/nashorn/runopt.sh @@ -130,6 +130,6 @@ $PRINT_ASM_FLAGS \ -Xms2G -Xmx2G \ -XX:TypeProfileLevel=222 \ -cp $CLASSPATH:../build/test/classes/ \ -jdk.nashorn.tools.Shell $ENABLE_TIME_FLAGS ${@} +org.openjdk.nashorn.tools.Shell $ENABLE_TIME_FLAGS ${@} diff --git a/doc/nashorn/DEVELOPER_README b/doc/nashorn/DEVELOPER_README index 78f508234..039c7595d 100644 --- a/doc/nashorn/DEVELOPER_README +++ b/doc/nashorn/DEVELOPER_README @@ -344,7 +344,7 @@ For example: --log=codegen,fields:finest is equivalent to The following is an incomplete list of subsystems that currently support logging. Look for classes implementing -jdk.nashorn.internal.runtime.logging.Loggable for more loggers. +org.openjdk.nashorn.internal.runtime.logging.Loggable for more loggers. * compiler diff --git a/make/CompileJavaModulesNashorn.gmk b/make/CompileJavaModulesNashorn.gmk index cc09a88b3..4392e861f 100644 --- a/make/CompileJavaModulesNashorn.gmk +++ b/make/CompileJavaModulesNashorn.gmk @@ -24,7 +24,7 @@ # NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src -ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm +ASM_SRC := $(TOPDIR)/src/java.base/share/classes/org/objectweb/asm # Build nasgen $(eval $(call SetupJavaCompilation, BUILD_NASGEN, \ @@ -39,16 +39,16 @@ NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run NASGEN_OPTIONS := \ -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \ --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \ - --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \ - --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \ + --add-exports java.base/org.objectweb.asm=ALL-UNNAMED \ + --add-exports java.base/org.objectweb.asm.util=ALL-UNNAMED \ # -# Run nasgen to modify classes in jdk.nashorn.internal.objects package +# Run nasgen to modify classes in org.openjdk.nashorn.internal.objects package $(NASGEN_RUN_FILE): $(BUILD_NASGEN) $($(MODULE)) $(ECHO) Running nasgen $(JAVA_SMALL) $(NASGEN_OPTIONS) \ - jdk.nashorn.internal.tools.nasgen.Main $(@D) \ - jdk.nashorn.internal.objects $(@D) + org.openjdk.nashorn.internal.tools.nasgen.Main $(@D) \ + org.openjdk.nashorn.internal.objects $(@D) $(TOUCH) $@ TARGETS += $(NASGEN_RUN_FILE) diff --git a/make/data/symbols/jdk.scripting.nashorn-7.sym.txt b/make/data/symbols/jdk.scripting.nashorn-7.sym.txt index 0bc9c5945..3972fe2fd 100644 --- a/make/data/symbols/jdk.scripting.nashorn-7.sym.txt +++ b/make/data/symbols/jdk.scripting.nashorn-7.sym.txt @@ -26,21 +26,21 @@ # ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ### # ########################################################## # --class name jdk/nashorn/api/scripting/AbstractJSObject +-class name org/openjdk/nashorn/api/scripting/AbstractJSObject --class name jdk/nashorn/api/scripting/ClassFilter +-class name org/openjdk/nashorn/api/scripting/ClassFilter --class name jdk/nashorn/api/scripting/JSObject +-class name org/openjdk/nashorn/api/scripting/JSObject --class name jdk/nashorn/api/scripting/NashornException +-class name org/openjdk/nashorn/api/scripting/NashornException --class name jdk/nashorn/api/scripting/NashornScriptEngine +-class name org/openjdk/nashorn/api/scripting/NashornScriptEngine --class name jdk/nashorn/api/scripting/NashornScriptEngineFactory +-class name org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory --class name jdk/nashorn/api/scripting/ScriptObjectMirror +-class name org/openjdk/nashorn/api/scripting/ScriptObjectMirror --class name jdk/nashorn/api/scripting/ScriptUtils +-class name org/openjdk/nashorn/api/scripting/ScriptUtils --class name jdk/nashorn/api/scripting/URLReader +-class name org/openjdk/nashorn/api/scripting/URLReader diff --git a/make/data/symbols/jdk.scripting.nashorn-8.sym.txt b/make/data/symbols/jdk.scripting.nashorn-8.sym.txt index ae38fef3c..ec1650ed8 100644 --- a/make/data/symbols/jdk.scripting.nashorn-8.sym.txt +++ b/make/data/symbols/jdk.scripting.nashorn-8.sym.txt @@ -26,8 +26,8 @@ # ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ### # ########################################################## # -class name jdk/nashorn/api/scripting/AbstractJSObject -header extends java/lang/Object implements jdk/nashorn/api/scripting/JSObject flags 421 runtimeAnnotations @Ljdk/Exported; +class name org/openjdk/nashorn/api/scripting/AbstractJSObject +header extends java/lang/Object implements org/openjdk/nashorn/api/scripting/JSObject flags 421 runtimeAnnotations @Ljdk/Exported; method name descriptor ()V flags 1 method name call descriptor (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; flags 81 method name newObject descriptor ([Ljava/lang/Object;)Ljava/lang/Object; flags 81 @@ -49,13 +49,13 @@ method name isStrictFunction descriptor ()Z flags 1 method name isArray descriptor ()Z flags 1 method name toNumber descriptor ()D flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated; method name getDefaultValue descriptor (Ljava/lang/Class;)Ljava/lang/Object; flags 1 signature (Ljava/lang/Class<*>;)Ljava/lang/Object; -method name getDefaultValue descriptor (Ljdk/nashorn/api/scripting/JSObject;Ljava/lang/Class;)Ljava/lang/Object; flags 9 signature (Ljdk/nashorn/api/scripting/JSObject;Ljava/lang/Class<*>;)Ljava/lang/Object; +method name getDefaultValue descriptor (Lorg/openjdk/nashorn/api/scripting/JSObject;Ljava/lang/Class;)Ljava/lang/Object; flags 9 signature (Lorg/openjdk/nashorn/api/scripting/JSObject;Ljava/lang/Class<*>;)Ljava/lang/Object; -class name jdk/nashorn/api/scripting/ClassFilter +class name org/openjdk/nashorn/api/scripting/ClassFilter header extends java/lang/Object flags 601 runtimeAnnotations @Ljdk/Exported; method name exposeToScripts descriptor (Ljava/lang/String;)Z flags 401 -class name jdk/nashorn/api/scripting/JSObject +class name org/openjdk/nashorn/api/scripting/JSObject header extends java/lang/Object flags 601 runtimeAnnotations @Ljdk/Exported; method name call descriptor (Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; flags 481 method name newObject descriptor ([Ljava/lang/Object;)Ljava/lang/Object; flags 481 @@ -77,7 +77,7 @@ method name isStrictFunction descriptor ()Z flags 401 method name isArray descriptor ()Z flags 401 method name toNumber descriptor ()D flags 401 deprecated true runtimeAnnotations @Ljava/lang/Deprecated; -class name jdk/nashorn/api/scripting/NashornException +class name org/openjdk/nashorn/api/scripting/NashornException header extends java/lang/RuntimeException flags 421 runtimeAnnotations @Ljdk/Exported; method name descriptor (Ljava/lang/String;Ljava/lang/String;II)V flags 4 method name descriptor (Ljava/lang/String;Ljava/lang/Throwable;Ljava/lang/String;II)V flags 4 @@ -91,11 +91,11 @@ method name setColumnNumber descriptor (I)V flags 11 method name getScriptFrames descriptor (Ljava/lang/Throwable;)[Ljava/lang/StackTraceElement; flags 9 method name getScriptStackString descriptor (Ljava/lang/Throwable;)Ljava/lang/String; flags 9 method name getThrown descriptor ()Ljava/lang/Object; flags 4 -method name initEcmaError descriptor (Ljdk/nashorn/internal/runtime/ScriptObject;)Ljdk/nashorn/api/scripting/NashornException; flags 4 +method name initEcmaError descriptor (Lorg/openjdk/nashorn/internal/runtime/ScriptObject;)Lorg/openjdk/nashorn/api/scripting/NashornException; flags 4 method name getEcmaError descriptor ()Ljava/lang/Object; flags 1 method name setEcmaError descriptor (Ljava/lang/Object;)V flags 1 -class name jdk/nashorn/api/scripting/NashornScriptEngine +class name org/openjdk/nashorn/api/scripting/NashornScriptEngine header extends javax/script/AbstractScriptEngine implements javax/script/Compilable,javax/script/Invocable flags 31 runtimeAnnotations @Ljdk/Exported; innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 field name NASHORN_GLOBAL descriptor Ljava/lang/String; constantValue nashorn.global flags 19 @@ -110,7 +110,7 @@ method name invokeMethod descriptor (Ljava/lang/Object;Ljava/lang/String;[Ljava/ method name getInterface descriptor (Ljava/lang/Class;)Ljava/lang/Object; flags 1 signature (Ljava/lang/Class;)TT; method name getInterface descriptor (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object; flags 1 signature (Ljava/lang/Object;Ljava/lang/Class;)TT; -class name jdk/nashorn/api/scripting/NashornScriptEngineFactory +class name org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory header extends java/lang/Object implements javax/script/ScriptEngineFactory flags 31 runtimeAnnotations @Ljdk/Exported; method name descriptor ()V flags 1 method name getEngineName descriptor ()Ljava/lang/String; flags 1 @@ -126,13 +126,13 @@ method name getParameter descriptor (Ljava/lang/String;)Ljava/lang/Object; flags method name getProgram descriptor ([Ljava/lang/String;)Ljava/lang/String; flags 81 method name getScriptEngine descriptor ()Ljavax/script/ScriptEngine; flags 1 method name getScriptEngine descriptor (Ljava/lang/ClassLoader;)Ljavax/script/ScriptEngine; flags 1 -method name getScriptEngine descriptor (Ljdk/nashorn/api/scripting/ClassFilter;)Ljavax/script/ScriptEngine; flags 1 +method name getScriptEngine descriptor (Lorg/openjdk/nashorn/api/scripting/ClassFilter;)Ljavax/script/ScriptEngine; flags 1 method name getScriptEngine descriptor ([Ljava/lang/String;)Ljavax/script/ScriptEngine; flags 81 method name getScriptEngine descriptor ([Ljava/lang/String;Ljava/lang/ClassLoader;)Ljavax/script/ScriptEngine; flags 1 -method name getScriptEngine descriptor ([Ljava/lang/String;Ljava/lang/ClassLoader;Ljdk/nashorn/api/scripting/ClassFilter;)Ljavax/script/ScriptEngine; flags 1 +method name getScriptEngine descriptor ([Ljava/lang/String;Ljava/lang/ClassLoader;Lorg/openjdk/nashorn/api/scripting/ClassFilter;)Ljavax/script/ScriptEngine; flags 1 -class name jdk/nashorn/api/scripting/ScriptObjectMirror -header extends jdk/nashorn/api/scripting/AbstractJSObject implements javax/script/Bindings flags 31 runtimeAnnotations @Ljdk/Exported; +class name org/openjdk/nashorn/api/scripting/ScriptObjectMirror +header extends org/openjdk/nashorn/api/scripting/AbstractJSObject implements javax/script/Bindings flags 31 runtimeAnnotations @Ljdk/Exported; innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609 method name equals descriptor (Ljava/lang/Object;)Z flags 1 method name hashCode descriptor ()I flags 1 @@ -171,11 +171,11 @@ method name getProto descriptor ()Ljava/lang/Object; flags 1 method name setProto descriptor (Ljava/lang/Object;)V flags 1 method name getOwnPropertyDescriptor descriptor (Ljava/lang/String;)Ljava/lang/Object; flags 1 method name getOwnKeys descriptor (Z)[Ljava/lang/String; flags 1 -method name preventExtensions descriptor ()Ljdk/nashorn/api/scripting/ScriptObjectMirror; flags 1 +method name preventExtensions descriptor ()Lorg/openjdk/nashorn/api/scripting/ScriptObjectMirror; flags 1 method name isExtensible descriptor ()Z flags 1 -method name seal descriptor ()Ljdk/nashorn/api/scripting/ScriptObjectMirror; flags 1 +method name seal descriptor ()Lorg/openjdk/nashorn/api/scripting/ScriptObjectMirror; flags 1 method name isSealed descriptor ()Z flags 1 -method name freeze descriptor ()Ljdk/nashorn/api/scripting/ScriptObjectMirror; flags 1 +method name freeze descriptor ()Lorg/openjdk/nashorn/api/scripting/ScriptObjectMirror; flags 1 method name isFrozen descriptor ()Z flags 1 method name isUndefined descriptor (Ljava/lang/Object;)Z flags 9 method name to descriptor (Ljava/lang/Class;)Ljava/lang/Object; flags 1 signature (Ljava/lang/Class;)TT; @@ -189,18 +189,18 @@ method name toNumber descriptor ()D flags 1 deprecated true runtimeAnnotations @ method name getDefaultValue descriptor (Ljava/lang/Class;)Ljava/lang/Object; flags 1 signature (Ljava/lang/Class<*>;)Ljava/lang/Object; method name put descriptor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; flags 1041 -class name jdk/nashorn/api/scripting/ScriptUtils +class name org/openjdk/nashorn/api/scripting/ScriptUtils header extends java/lang/Object flags 31 runtimeAnnotations @Ljdk/Exported; method name parse descriptor (Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String; flags 9 method name format descriptor (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; flags 9 method name makeSynchronizedFunction descriptor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; flags 9 -method name wrap descriptor (Ljava/lang/Object;)Ljdk/nashorn/api/scripting/ScriptObjectMirror; flags 9 +method name wrap descriptor (Ljava/lang/Object;)Lorg/openjdk/nashorn/api/scripting/ScriptObjectMirror; flags 9 method name unwrap descriptor (Ljava/lang/Object;)Ljava/lang/Object; flags 9 method name wrapArray descriptor ([Ljava/lang/Object;)[Ljava/lang/Object; flags 9 method name unwrapArray descriptor ([Ljava/lang/Object;)[Ljava/lang/Object; flags 9 method name convert descriptor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; flags 9 -class name jdk/nashorn/api/scripting/URLReader +class name org/openjdk/nashorn/api/scripting/URLReader header extends java/io/Reader flags 31 runtimeAnnotations @Ljdk/Exported; method name descriptor (Ljava/net/URL;)V flags 1 method name descriptor (Ljava/net/URL;Ljava/lang/String;)V flags 1 diff --git a/make/data/symbols/jdk.scripting.nashorn-9.sym.txt b/make/data/symbols/jdk.scripting.nashorn-9.sym.txt index fd9123dc2..40d4ea1ed 100644 --- a/make/data/symbols/jdk.scripting.nashorn-9.sym.txt +++ b/make/data/symbols/jdk.scripting.nashorn-9.sym.txt @@ -26,135 +26,135 @@ # ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ### # ########################################################## # -module name jdk.scripting.nashorn -header exports jdk/nashorn/api/scripting,jdk/nashorn/api/tree requires name\u0020;jdk.dynalink\u0020;flags\u0020;0,name\u0020;java.logging\u0020;flags\u0020;0,name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.scripting\u0020;flags\u0020;20 provides interface\u0020;javax/script/ScriptEngineFactory\u0020;impls\u0020;jdk/nashorn/api/scripting/NashornScriptEngineFactory,interface\u0020;jdk/dynalink/linker/GuardingDynamicLinkerExporter\u0020;impls\u0020;jdk/nashorn/api/linker/NashornLinkerExporter flags 8000 +module name org.openjdk.nashorn +header exports org/openjdk/nashorn/api/scripting,org/openjdk/nashorn/api/tree requires name\u0020;jdk.dynalink\u0020;flags\u0020;0,name\u0020;java.logging\u0020;flags\u0020;0,name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.scripting\u0020;flags\u0020;20 provides interface\u0020;javax/script/ScriptEngineFactory\u0020;impls\u0020;org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory,interface\u0020;jdk/dynalink/linker/GuardingDynamicLinkerExporter\u0020;impls\u0020;org/openjdk/nashorn/api/linker/NashornLinkerExporter flags 8000 -class name jdk/nashorn/api/scripting/AbstractJSObject -header extends java/lang/Object implements jdk/nashorn/api/scripting/JSObject flags 421 +class name org/openjdk/nashorn/api/scripting/AbstractJSObject +header extends java/lang/Object implements org/openjdk/nashorn/api/scripting/JSObject flags 421 -method name getDefaultValue descriptor (Ljava/lang/Class;)Ljava/lang/Object; --method name getDefaultValue descriptor (Ljdk/nashorn/api/scripting/JSObject;Ljava/lang/Class;)Ljava/lang/Object; -method name getDefaultValue descriptor (Ljdk/nashorn/api/scripting/JSObject;Ljava/lang/Class;)Ljava/lang/Object; flags 9 deprecated true signature (Ljdk/nashorn/api/scripting/JSObject;Ljava/lang/Class<*>;)Ljava/lang/Object; runtimeAnnotations @Ljava/lang/Deprecated; +-method name getDefaultValue descriptor (Lorg/openjdk/nashorn/api/scripting/JSObject;Ljava/lang/Class;)Ljava/lang/Object; +method name getDefaultValue descriptor (Lorg/openjdk/nashorn/api/scripting/JSObject;Ljava/lang/Class;)Ljava/lang/Object; flags 9 deprecated true signature (Lorg/openjdk/nashorn/api/scripting/JSObject;Ljava/lang/Class<*>;)Ljava/lang/Object; runtimeAnnotations @Ljava/lang/Deprecated; -class name jdk/nashorn/api/scripting/ClassFilter +class name org/openjdk/nashorn/api/scripting/ClassFilter header extends java/lang/Object flags 601 -class name jdk/nashorn/api/scripting/JSObject +class name org/openjdk/nashorn/api/scripting/JSObject header extends java/lang/Object flags 601 -method name toNumber descriptor ()D method name toNumber descriptor ()D flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated; method name getDefaultValue descriptor (Ljava/lang/Class;)Ljava/lang/Object; thrownTypes java/lang/UnsupportedOperationException flags 1 signature (Ljava/lang/Class<*>;)Ljava/lang/Object; -class name jdk/nashorn/api/scripting/NashornException +class name org/openjdk/nashorn/api/scripting/NashornException header extends java/lang/RuntimeException flags 421 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 --method name initEcmaError descriptor (Ljdk/nashorn/internal/runtime/ScriptObject;)Ljdk/nashorn/api/scripting/NashornException; +-method name initEcmaError descriptor (Lorg/openjdk/nashorn/internal/runtime/ScriptObject;)Lorg/openjdk/nashorn/api/scripting/NashornException; -class name jdk/nashorn/api/scripting/NashornScriptEngine +class name org/openjdk/nashorn/api/scripting/NashornScriptEngine header extends javax/script/AbstractScriptEngine implements javax/script/Compilable,javax/script/Invocable flags 31 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/NashornScriptEngineFactory +class name org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory header extends java/lang/Object implements javax/script/ScriptEngineFactory flags 31 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/ScriptObjectMirror -header extends jdk/nashorn/api/scripting/AbstractJSObject implements javax/script/Bindings flags 31 +class name org/openjdk/nashorn/api/scripting/ScriptObjectMirror +header extends org/openjdk/nashorn/api/scripting/AbstractJSObject implements javax/script/Bindings flags 31 innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/ScriptUtils +class name org/openjdk/nashorn/api/scripting/ScriptUtils header extends java/lang/Object flags 31 -class name jdk/nashorn/api/scripting/URLReader +class name org/openjdk/nashorn/api/scripting/URLReader header extends java/io/Reader flags 31 -class name jdk/nashorn/api/tree/ArrayAccessTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getIndex descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/ArrayAccessTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getIndex descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 -class name jdk/nashorn/api/tree/ArrayLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExpressionTree;>; +class name org/openjdk/nashorn/api/tree/ArrayLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExpressionTree;>; -class name jdk/nashorn/api/tree/AssignmentTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getVariable descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/AssignmentTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getVariable descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 -class name jdk/nashorn/api/tree/BinaryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getLeftOperand descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getRightOperand descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/BinaryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getLeftOperand descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getRightOperand descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 -class name jdk/nashorn/api/tree/BlockTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getStatements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/StatementTree;>; +class name org/openjdk/nashorn/api/tree/BlockTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getStatements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/StatementTree;>; -class name jdk/nashorn/api/tree/BreakTree -header extends java/lang/Object implements jdk/nashorn/api/tree/GotoTree flags 601 +class name org/openjdk/nashorn/api/tree/BreakTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/GotoTree flags 601 method name getLabel descriptor ()Ljava/lang/String; flags 401 -class name jdk/nashorn/api/tree/CaseTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/StatementTree;>; - -class name jdk/nashorn/api/tree/CatchTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getParameter descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getBlock descriptor ()Ljdk/nashorn/api/tree/BlockTree; flags 401 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/ClassDeclarationTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getClassHeritage descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getConstructor descriptor ()Ljdk/nashorn/api/tree/PropertyTree; flags 401 -method name getClassElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/PropertyTree;>; - -class name jdk/nashorn/api/tree/ClassExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getClassHeritage descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getConstructor descriptor ()Ljdk/nashorn/api/tree/PropertyTree; flags 401 -method name getClassElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/PropertyTree;>; - -class name jdk/nashorn/api/tree/CompilationUnitTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getSourceElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/Tree;>; +class name org/openjdk/nashorn/api/tree/CaseTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/StatementTree;>; + +class name org/openjdk/nashorn/api/tree/CatchTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getParameter descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getBlock descriptor ()Lorg/openjdk/nashorn/api/tree/BlockTree; flags 401 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ClassDeclarationTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getClassHeritage descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getConstructor descriptor ()Lorg/openjdk/nashorn/api/tree/PropertyTree; flags 401 +method name getClassElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/PropertyTree;>; + +class name org/openjdk/nashorn/api/tree/ClassExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getClassHeritage descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getConstructor descriptor ()Lorg/openjdk/nashorn/api/tree/PropertyTree; flags 401 +method name getClassElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/PropertyTree;>; + +class name org/openjdk/nashorn/api/tree/CompilationUnitTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getSourceElements descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/Tree;>; method name getSourceName descriptor ()Ljava/lang/String; flags 401 method name isStrict descriptor ()Z flags 401 -method name getLineMap descriptor ()Ljdk/nashorn/api/tree/LineMap; flags 401 -method name getModule descriptor ()Ljdk/nashorn/api/tree/ModuleTree; flags 401 - -class name jdk/nashorn/api/tree/CompoundAssignmentTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getVariable descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/ConditionalExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getTrueExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getFalseExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/ConditionalLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/LoopTree flags 601 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/ContinueTree -header extends java/lang/Object implements jdk/nashorn/api/tree/GotoTree flags 601 +method name getLineMap descriptor ()Lorg/openjdk/nashorn/api/tree/LineMap; flags 401 +method name getModule descriptor ()Lorg/openjdk/nashorn/api/tree/ModuleTree; flags 401 + +class name org/openjdk/nashorn/api/tree/CompoundAssignmentTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getVariable descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ConditionalExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getTrueExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getFalseExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ConditionalLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/LoopTree flags 601 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ContinueTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/GotoTree flags 601 method name getLabel descriptor ()Ljava/lang/String; flags 401 -class name jdk/nashorn/api/tree/DebuggerTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 +class name org/openjdk/nashorn/api/tree/DebuggerTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 -class name jdk/nashorn/api/tree/Diagnostic +class name org/openjdk/nashorn/api/tree/Diagnostic header extends java/lang/Object flags 601 -innerclass innerClass jdk/nashorn/api/tree/Diagnostic$Kind outerClass jdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 +innerclass innerClass org/openjdk/nashorn/api/tree/Diagnostic$Kind outerClass org/openjdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 field name NOPOS descriptor J constantValue -1 flags 19 -method name getKind descriptor ()Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 401 +method name getKind descriptor ()Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 401 method name getPosition descriptor ()J flags 401 method name getFileName descriptor ()Ljava/lang/String; flags 401 method name getLineNumber descriptor ()J flags 401 @@ -162,94 +162,94 @@ method name getColumnNumber descriptor ()J flags 401 method name getCode descriptor ()Ljava/lang/String; flags 401 method name getMessage descriptor ()Ljava/lang/String; flags 401 -class name jdk/nashorn/api/tree/Diagnostic$Kind -header extends java/lang/Enum flags 4031 signature Ljava/lang/Enum; -innerclass innerClass jdk/nashorn/api/tree/Diagnostic$Kind outerClass jdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 -field name ERROR descriptor Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 -field name WARNING descriptor Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 -field name MANDATORY_WARNING descriptor Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 -field name NOTE descriptor Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 -field name OTHER descriptor Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 -method name values descriptor ()[Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 9 -method name valueOf descriptor (Ljava/lang/String;)Ljdk/nashorn/api/tree/Diagnostic$Kind; flags 9 - -class name jdk/nashorn/api/tree/DiagnosticListener +class name org/openjdk/nashorn/api/tree/Diagnostic$Kind +header extends java/lang/Enum flags 4031 signature Ljava/lang/Enum; +innerclass innerClass org/openjdk/nashorn/api/tree/Diagnostic$Kind outerClass org/openjdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 +field name ERROR descriptor Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 +field name WARNING descriptor Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 +field name MANDATORY_WARNING descriptor Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 +field name NOTE descriptor Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 +field name OTHER descriptor Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 4019 +method name values descriptor ()[Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 9 +method name valueOf descriptor (Ljava/lang/String;)Lorg/openjdk/nashorn/api/tree/Diagnostic$Kind; flags 9 + +class name org/openjdk/nashorn/api/tree/DiagnosticListener header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface; -method name report descriptor (Ljdk/nashorn/api/tree/Diagnostic;)V flags 401 - -class name jdk/nashorn/api/tree/DoWhileLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ConditionalLoopTree flags 601 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 - -class name jdk/nashorn/api/tree/EmptyStatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 - -class name jdk/nashorn/api/tree/ErroneousTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 - -class name jdk/nashorn/api/tree/ExportEntryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getExportName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getModuleRequest descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getImportName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getLocalName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 - -class name jdk/nashorn/api/tree/ExpressionStatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/ExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 - -class name jdk/nashorn/api/tree/ForInLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/LoopTree flags 601 -method name getVariable descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 +method name report descriptor (Lorg/openjdk/nashorn/api/tree/Diagnostic;)V flags 401 + +class name org/openjdk/nashorn/api/tree/DoWhileLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ConditionalLoopTree flags 601 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 + +class name org/openjdk/nashorn/api/tree/EmptyStatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 + +class name org/openjdk/nashorn/api/tree/ErroneousTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 + +class name org/openjdk/nashorn/api/tree/ExportEntryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getExportName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getModuleRequest descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getImportName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getLocalName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ExpressionStatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 + +class name org/openjdk/nashorn/api/tree/ForInLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/LoopTree flags 601 +method name getVariable descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 method name isForEach descriptor ()Z flags 401 -class name jdk/nashorn/api/tree/ForLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ConditionalLoopTree flags 601 -method name getInitializer descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getUpdate descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 - -class name jdk/nashorn/api/tree/ForOfLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/LoopTree flags 601 -method name getVariable descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 - -class name jdk/nashorn/api/tree/FunctionCallTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getFunctionSelect descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getArguments descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExpressionTree;>; - -class name jdk/nashorn/api/tree/FunctionDeclarationTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getParameters descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExpressionTree;>; -method name getBody descriptor ()Ljdk/nashorn/api/tree/BlockTree; flags 401 +class name org/openjdk/nashorn/api/tree/ForLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ConditionalLoopTree flags 601 +method name getInitializer descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getUpdate descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ForOfLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/LoopTree flags 601 +method name getVariable descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 + +class name org/openjdk/nashorn/api/tree/FunctionCallTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getFunctionSelect descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getArguments descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExpressionTree;>; + +class name org/openjdk/nashorn/api/tree/FunctionDeclarationTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getParameters descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExpressionTree;>; +method name getBody descriptor ()Lorg/openjdk/nashorn/api/tree/BlockTree; flags 401 method name isStrict descriptor ()Z flags 401 method name isGenerator descriptor ()Z flags 401 -class name jdk/nashorn/api/tree/FunctionExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getParameters descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExpressionTree;>; -method name getBody descriptor ()Ljdk/nashorn/api/tree/Tree; flags 401 +class name org/openjdk/nashorn/api/tree/FunctionExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getParameters descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExpressionTree;>; +method name getBody descriptor ()Lorg/openjdk/nashorn/api/tree/Tree; flags 401 method name isStrict descriptor ()Z flags 401 method name isArrow descriptor ()Z flags 401 method name isGenerator descriptor ()Z flags 401 -class name jdk/nashorn/api/tree/GotoTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 +class name org/openjdk/nashorn/api/tree/GotoTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 method name getLabel descriptor ()Ljava/lang/String; flags 401 -class name jdk/nashorn/api/tree/IdentifierTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 +class name org/openjdk/nashorn/api/tree/IdentifierTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 method name getName descriptor ()Ljava/lang/String; flags 401 method name isRestParameter descriptor ()Z flags 401 method name isSuper descriptor ()Z flags 401 @@ -258,388 +258,388 @@ method name isStar descriptor ()Z flags 401 method name isDefault descriptor ()Z flags 401 method name isStarDefaultStar descriptor ()Z flags 401 -class name jdk/nashorn/api/tree/IfTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getThenStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 -method name getElseStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 - -class name jdk/nashorn/api/tree/ImportEntryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getModuleRequest descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getImportName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 -method name getLocalName descriptor ()Ljdk/nashorn/api/tree/IdentifierTree; flags 401 - -class name jdk/nashorn/api/tree/InstanceOfTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getType descriptor ()Ljdk/nashorn/api/tree/Tree; flags 401 - -class name jdk/nashorn/api/tree/LabeledStatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 +class name org/openjdk/nashorn/api/tree/IfTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getThenStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 +method name getElseStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 + +class name org/openjdk/nashorn/api/tree/ImportEntryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getModuleRequest descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getImportName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 +method name getLocalName descriptor ()Lorg/openjdk/nashorn/api/tree/IdentifierTree; flags 401 + +class name org/openjdk/nashorn/api/tree/InstanceOfTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getType descriptor ()Lorg/openjdk/nashorn/api/tree/Tree; flags 401 + +class name org/openjdk/nashorn/api/tree/LabeledStatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 method name getLabel descriptor ()Ljava/lang/String; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 -class name jdk/nashorn/api/tree/LineMap +class name org/openjdk/nashorn/api/tree/LineMap header extends java/lang/Object flags 601 method name getLineNumber descriptor (J)J flags 401 method name getColumnNumber descriptor (J)J flags 401 -class name jdk/nashorn/api/tree/LiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 +class name org/openjdk/nashorn/api/tree/LiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 method name getValue descriptor ()Ljava/lang/Object; flags 401 -class name jdk/nashorn/api/tree/LoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 +class name org/openjdk/nashorn/api/tree/LoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 -class name jdk/nashorn/api/tree/MemberSelectTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/MemberSelectTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 method name getIdentifier descriptor ()Ljava/lang/String; flags 401 -class name jdk/nashorn/api/tree/ModuleTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getImportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ImportEntryTree;>; -method name getLocalExportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExportEntryTree;>; -method name getIndirectExportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExportEntryTree;>; -method name getStarExportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExportEntryTree;>; +class name org/openjdk/nashorn/api/tree/ModuleTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getImportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ImportEntryTree;>; +method name getLocalExportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExportEntryTree;>; +method name getIndirectExportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExportEntryTree;>; +method name getStarExportEntries descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExportEntryTree;>; -class name jdk/nashorn/api/tree/NewTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getConstructorExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/NewTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getConstructorExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 -class name jdk/nashorn/api/tree/ObjectLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getProperties descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/PropertyTree;>; +class name org/openjdk/nashorn/api/tree/ObjectLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getProperties descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/PropertyTree;>; -class name jdk/nashorn/api/tree/ParenthesizedTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/ParenthesizedTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 -class name jdk/nashorn/api/tree/Parser +class name org/openjdk/nashorn/api/tree/Parser header extends java/lang/Object flags 601 -method name parse descriptor (Ljava/io/File;Ljdk/nashorn/api/tree/DiagnosticListener;)Ljdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,jdk/nashorn/api/scripting/NashornException flags 401 -method name parse descriptor (Ljava/nio/file/Path;Ljdk/nashorn/api/tree/DiagnosticListener;)Ljdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,jdk/nashorn/api/scripting/NashornException flags 401 -method name parse descriptor (Ljava/net/URL;Ljdk/nashorn/api/tree/DiagnosticListener;)Ljdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,jdk/nashorn/api/scripting/NashornException flags 401 -method name parse descriptor (Ljava/lang/String;Ljava/io/Reader;Ljdk/nashorn/api/tree/DiagnosticListener;)Ljdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,jdk/nashorn/api/scripting/NashornException flags 401 -method name parse descriptor (Ljava/lang/String;Ljava/lang/String;Ljdk/nashorn/api/tree/DiagnosticListener;)Ljdk/nashorn/api/tree/CompilationUnitTree; thrownTypes jdk/nashorn/api/scripting/NashornException flags 401 -method name parse descriptor (Ljdk/nashorn/api/scripting/ScriptObjectMirror;Ljdk/nashorn/api/tree/DiagnosticListener;)Ljdk/nashorn/api/tree/CompilationUnitTree; thrownTypes jdk/nashorn/api/scripting/NashornException flags 401 -method name create descriptor ([Ljava/lang/String;)Ljdk/nashorn/api/tree/Parser; thrownTypes java/lang/IllegalArgumentException flags 89 - -class name jdk/nashorn/api/tree/PropertyTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 -method name getKey descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getValue descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getGetter descriptor ()Ljdk/nashorn/api/tree/FunctionExpressionTree; flags 401 -method name getSetter descriptor ()Ljdk/nashorn/api/tree/FunctionExpressionTree; flags 401 +method name parse descriptor (Ljava/io/File;Lorg/openjdk/nashorn/api/tree/DiagnosticListener;)Lorg/openjdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,org/openjdk/nashorn/api/scripting/NashornException flags 401 +method name parse descriptor (Ljava/nio/file/Path;Lorg/openjdk/nashorn/api/tree/DiagnosticListener;)Lorg/openjdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,org/openjdk/nashorn/api/scripting/NashornException flags 401 +method name parse descriptor (Ljava/net/URL;Lorg/openjdk/nashorn/api/tree/DiagnosticListener;)Lorg/openjdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,org/openjdk/nashorn/api/scripting/NashornException flags 401 +method name parse descriptor (Ljava/lang/String;Ljava/io/Reader;Lorg/openjdk/nashorn/api/tree/DiagnosticListener;)Lorg/openjdk/nashorn/api/tree/CompilationUnitTree; thrownTypes java/io/IOException,org/openjdk/nashorn/api/scripting/NashornException flags 401 +method name parse descriptor (Ljava/lang/String;Ljava/lang/String;Lorg/openjdk/nashorn/api/tree/DiagnosticListener;)Lorg/openjdk/nashorn/api/tree/CompilationUnitTree; thrownTypes org/openjdk/nashorn/api/scripting/NashornException flags 401 +method name parse descriptor (Lorg/openjdk/nashorn/api/scripting/ScriptObjectMirror;Lorg/openjdk/nashorn/api/tree/DiagnosticListener;)Lorg/openjdk/nashorn/api/tree/CompilationUnitTree; thrownTypes org/openjdk/nashorn/api/scripting/NashornException flags 401 +method name create descriptor ([Ljava/lang/String;)Lorg/openjdk/nashorn/api/tree/Parser; thrownTypes java/lang/IllegalArgumentException flags 89 + +class name org/openjdk/nashorn/api/tree/PropertyTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 +method name getKey descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getValue descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getGetter descriptor ()Lorg/openjdk/nashorn/api/tree/FunctionExpressionTree; flags 401 +method name getSetter descriptor ()Lorg/openjdk/nashorn/api/tree/FunctionExpressionTree; flags 401 method name isStatic descriptor ()Z flags 401 method name isComputed descriptor ()Z flags 401 -class name jdk/nashorn/api/tree/RegExpLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 +class name org/openjdk/nashorn/api/tree/RegExpLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 method name getPattern descriptor ()Ljava/lang/String; flags 401 method name getOptions descriptor ()Ljava/lang/String; flags 401 -class name jdk/nashorn/api/tree/ReturnTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/ReturnTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 -class name jdk/nashorn/api/tree/SimpleTreeVisitorES5_1 -header extends java/lang/Object implements jdk/nashorn/api/tree/TreeVisitor flags 21 signature Ljava/lang/Object;Ljdk/nashorn/api/tree/TreeVisitor; +class name org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1 +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/TreeVisitor flags 21 signature Ljava/lang/Object;Lorg/openjdk/nashorn/api/tree/TreeVisitor; innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 method name descriptor ()V flags 1 -method name visitAssignment descriptor (Ljdk/nashorn/api/tree/AssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/AssignmentTree;TP;)TR; -method name visitCompoundAssignment descriptor (Ljdk/nashorn/api/tree/CompoundAssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/CompoundAssignmentTree;TP;)TR; -method name visitModule descriptor (Ljdk/nashorn/api/tree/ModuleTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ModuleTree;TP;)TR; -method name visitExportEntry descriptor (Ljdk/nashorn/api/tree/ExportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ExportEntryTree;TP;)TR; -method name visitImportEntry descriptor (Ljdk/nashorn/api/tree/ImportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ImportEntryTree;TP;)TR; -method name visitBinary descriptor (Ljdk/nashorn/api/tree/BinaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/BinaryTree;TP;)TR; -method name visitBlock descriptor (Ljdk/nashorn/api/tree/BlockTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/BlockTree;TP;)TR; -method name visitBreak descriptor (Ljdk/nashorn/api/tree/BreakTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/BreakTree;TP;)TR; -method name visitCase descriptor (Ljdk/nashorn/api/tree/CaseTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/CaseTree;TP;)TR; -method name visitCatch descriptor (Ljdk/nashorn/api/tree/CatchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/CatchTree;TP;)TR; -method name visitClassDeclaration descriptor (Ljdk/nashorn/api/tree/ClassDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ClassDeclarationTree;TP;)TR; -method name visitClassExpression descriptor (Ljdk/nashorn/api/tree/ClassExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ClassExpressionTree;TP;)TR; -method name visitConditionalExpression descriptor (Ljdk/nashorn/api/tree/ConditionalExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ConditionalExpressionTree;TP;)TR; -method name visitContinue descriptor (Ljdk/nashorn/api/tree/ContinueTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ContinueTree;TP;)TR; -method name visitDebugger descriptor (Ljdk/nashorn/api/tree/DebuggerTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/DebuggerTree;TP;)TR; -method name visitDoWhileLoop descriptor (Ljdk/nashorn/api/tree/DoWhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/DoWhileLoopTree;TP;)TR; -method name visitErroneous descriptor (Ljdk/nashorn/api/tree/ErroneousTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ErroneousTree;TP;)TR; -method name visitExpressionStatement descriptor (Ljdk/nashorn/api/tree/ExpressionStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ExpressionStatementTree;TP;)TR; -method name visitForLoop descriptor (Ljdk/nashorn/api/tree/ForLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ForLoopTree;TP;)TR; -method name visitForInLoop descriptor (Ljdk/nashorn/api/tree/ForInLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ForInLoopTree;TP;)TR; -method name visitForOfLoop descriptor (Ljdk/nashorn/api/tree/ForOfLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ForOfLoopTree;TP;)TR; -method name visitFunctionCall descriptor (Ljdk/nashorn/api/tree/FunctionCallTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/FunctionCallTree;TP;)TR; -method name visitFunctionDeclaration descriptor (Ljdk/nashorn/api/tree/FunctionDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/FunctionDeclarationTree;TP;)TR; -method name visitFunctionExpression descriptor (Ljdk/nashorn/api/tree/FunctionExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/FunctionExpressionTree;TP;)TR; -method name visitIdentifier descriptor (Ljdk/nashorn/api/tree/IdentifierTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/IdentifierTree;TP;)TR; -method name visitIf descriptor (Ljdk/nashorn/api/tree/IfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/IfTree;TP;)TR; -method name visitArrayAccess descriptor (Ljdk/nashorn/api/tree/ArrayAccessTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ArrayAccessTree;TP;)TR; -method name visitArrayLiteral descriptor (Ljdk/nashorn/api/tree/ArrayLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ArrayLiteralTree;TP;)TR; -method name visitLabeledStatement descriptor (Ljdk/nashorn/api/tree/LabeledStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/LabeledStatementTree;TP;)TR; -method name visitLiteral descriptor (Ljdk/nashorn/api/tree/LiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/LiteralTree;TP;)TR; -method name visitParenthesized descriptor (Ljdk/nashorn/api/tree/ParenthesizedTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ParenthesizedTree;TP;)TR; -method name visitReturn descriptor (Ljdk/nashorn/api/tree/ReturnTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ReturnTree;TP;)TR; -method name visitMemberSelect descriptor (Ljdk/nashorn/api/tree/MemberSelectTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/MemberSelectTree;TP;)TR; -method name visitNew descriptor (Ljdk/nashorn/api/tree/NewTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/NewTree;TP;)TR; -method name visitObjectLiteral descriptor (Ljdk/nashorn/api/tree/ObjectLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ObjectLiteralTree;TP;)TR; -method name visitProperty descriptor (Ljdk/nashorn/api/tree/PropertyTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/PropertyTree;TP;)TR; -method name visitRegExpLiteral descriptor (Ljdk/nashorn/api/tree/RegExpLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/RegExpLiteralTree;TP;)TR; -method name visitTemplateLiteral descriptor (Ljdk/nashorn/api/tree/TemplateLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/TemplateLiteralTree;TP;)TR; -method name visitEmptyStatement descriptor (Ljdk/nashorn/api/tree/EmptyStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/EmptyStatementTree;TP;)TR; -method name visitSpread descriptor (Ljdk/nashorn/api/tree/SpreadTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/SpreadTree;TP;)TR; -method name visitSwitch descriptor (Ljdk/nashorn/api/tree/SwitchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/SwitchTree;TP;)TR; -method name visitThrow descriptor (Ljdk/nashorn/api/tree/ThrowTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ThrowTree;TP;)TR; -method name visitCompilationUnit descriptor (Ljdk/nashorn/api/tree/CompilationUnitTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/CompilationUnitTree;TP;)TR; -method name visitTry descriptor (Ljdk/nashorn/api/tree/TryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/TryTree;TP;)TR; -method name visitInstanceOf descriptor (Ljdk/nashorn/api/tree/InstanceOfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/InstanceOfTree;TP;)TR; -method name visitUnary descriptor (Ljdk/nashorn/api/tree/UnaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/UnaryTree;TP;)TR; -method name visitVariable descriptor (Ljdk/nashorn/api/tree/VariableTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/VariableTree;TP;)TR; -method name visitWhileLoop descriptor (Ljdk/nashorn/api/tree/WhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/WhileLoopTree;TP;)TR; -method name visitWith descriptor (Ljdk/nashorn/api/tree/WithTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/WithTree;TP;)TR; -method name visitYield descriptor (Ljdk/nashorn/api/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/YieldTree;TP;)TR; -method name visitUnknown descriptor (Ljdk/nashorn/api/tree/Tree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/Tree;TP;)TR; - -class name jdk/nashorn/api/tree/SimpleTreeVisitorES6 -header extends jdk/nashorn/api/tree/SimpleTreeVisitorES5_1 flags 21 signature Ljdk/nashorn/api/tree/SimpleTreeVisitorES5_1; +method name visitAssignment descriptor (Lorg/openjdk/nashorn/api/tree/AssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/AssignmentTree;TP;)TR; +method name visitCompoundAssignment descriptor (Lorg/openjdk/nashorn/api/tree/CompoundAssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/CompoundAssignmentTree;TP;)TR; +method name visitModule descriptor (Lorg/openjdk/nashorn/api/tree/ModuleTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ModuleTree;TP;)TR; +method name visitExportEntry descriptor (Lorg/openjdk/nashorn/api/tree/ExportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ExportEntryTree;TP;)TR; +method name visitImportEntry descriptor (Lorg/openjdk/nashorn/api/tree/ImportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ImportEntryTree;TP;)TR; +method name visitBinary descriptor (Lorg/openjdk/nashorn/api/tree/BinaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/BinaryTree;TP;)TR; +method name visitBlock descriptor (Lorg/openjdk/nashorn/api/tree/BlockTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/BlockTree;TP;)TR; +method name visitBreak descriptor (Lorg/openjdk/nashorn/api/tree/BreakTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/BreakTree;TP;)TR; +method name visitCase descriptor (Lorg/openjdk/nashorn/api/tree/CaseTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/CaseTree;TP;)TR; +method name visitCatch descriptor (Lorg/openjdk/nashorn/api/tree/CatchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/CatchTree;TP;)TR; +method name visitClassDeclaration descriptor (Lorg/openjdk/nashorn/api/tree/ClassDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ClassDeclarationTree;TP;)TR; +method name visitClassExpression descriptor (Lorg/openjdk/nashorn/api/tree/ClassExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ClassExpressionTree;TP;)TR; +method name visitConditionalExpression descriptor (Lorg/openjdk/nashorn/api/tree/ConditionalExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ConditionalExpressionTree;TP;)TR; +method name visitContinue descriptor (Lorg/openjdk/nashorn/api/tree/ContinueTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ContinueTree;TP;)TR; +method name visitDebugger descriptor (Lorg/openjdk/nashorn/api/tree/DebuggerTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/DebuggerTree;TP;)TR; +method name visitDoWhileLoop descriptor (Lorg/openjdk/nashorn/api/tree/DoWhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/DoWhileLoopTree;TP;)TR; +method name visitErroneous descriptor (Lorg/openjdk/nashorn/api/tree/ErroneousTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ErroneousTree;TP;)TR; +method name visitExpressionStatement descriptor (Lorg/openjdk/nashorn/api/tree/ExpressionStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ExpressionStatementTree;TP;)TR; +method name visitForLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ForLoopTree;TP;)TR; +method name visitForInLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForInLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ForInLoopTree;TP;)TR; +method name visitForOfLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForOfLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ForOfLoopTree;TP;)TR; +method name visitFunctionCall descriptor (Lorg/openjdk/nashorn/api/tree/FunctionCallTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/FunctionCallTree;TP;)TR; +method name visitFunctionDeclaration descriptor (Lorg/openjdk/nashorn/api/tree/FunctionDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/FunctionDeclarationTree;TP;)TR; +method name visitFunctionExpression descriptor (Lorg/openjdk/nashorn/api/tree/FunctionExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/FunctionExpressionTree;TP;)TR; +method name visitIdentifier descriptor (Lorg/openjdk/nashorn/api/tree/IdentifierTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/IdentifierTree;TP;)TR; +method name visitIf descriptor (Lorg/openjdk/nashorn/api/tree/IfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/IfTree;TP;)TR; +method name visitArrayAccess descriptor (Lorg/openjdk/nashorn/api/tree/ArrayAccessTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ArrayAccessTree;TP;)TR; +method name visitArrayLiteral descriptor (Lorg/openjdk/nashorn/api/tree/ArrayLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ArrayLiteralTree;TP;)TR; +method name visitLabeledStatement descriptor (Lorg/openjdk/nashorn/api/tree/LabeledStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/LabeledStatementTree;TP;)TR; +method name visitLiteral descriptor (Lorg/openjdk/nashorn/api/tree/LiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/LiteralTree;TP;)TR; +method name visitParenthesized descriptor (Lorg/openjdk/nashorn/api/tree/ParenthesizedTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ParenthesizedTree;TP;)TR; +method name visitReturn descriptor (Lorg/openjdk/nashorn/api/tree/ReturnTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ReturnTree;TP;)TR; +method name visitMemberSelect descriptor (Lorg/openjdk/nashorn/api/tree/MemberSelectTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/MemberSelectTree;TP;)TR; +method name visitNew descriptor (Lorg/openjdk/nashorn/api/tree/NewTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/NewTree;TP;)TR; +method name visitObjectLiteral descriptor (Lorg/openjdk/nashorn/api/tree/ObjectLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ObjectLiteralTree;TP;)TR; +method name visitProperty descriptor (Lorg/openjdk/nashorn/api/tree/PropertyTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/PropertyTree;TP;)TR; +method name visitRegExpLiteral descriptor (Lorg/openjdk/nashorn/api/tree/RegExpLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/RegExpLiteralTree;TP;)TR; +method name visitTemplateLiteral descriptor (Lorg/openjdk/nashorn/api/tree/TemplateLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/TemplateLiteralTree;TP;)TR; +method name visitEmptyStatement descriptor (Lorg/openjdk/nashorn/api/tree/EmptyStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/EmptyStatementTree;TP;)TR; +method name visitSpread descriptor (Lorg/openjdk/nashorn/api/tree/SpreadTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/SpreadTree;TP;)TR; +method name visitSwitch descriptor (Lorg/openjdk/nashorn/api/tree/SwitchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/SwitchTree;TP;)TR; +method name visitThrow descriptor (Lorg/openjdk/nashorn/api/tree/ThrowTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ThrowTree;TP;)TR; +method name visitCompilationUnit descriptor (Lorg/openjdk/nashorn/api/tree/CompilationUnitTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/CompilationUnitTree;TP;)TR; +method name visitTry descriptor (Lorg/openjdk/nashorn/api/tree/TryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/TryTree;TP;)TR; +method name visitInstanceOf descriptor (Lorg/openjdk/nashorn/api/tree/InstanceOfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/InstanceOfTree;TP;)TR; +method name visitUnary descriptor (Lorg/openjdk/nashorn/api/tree/UnaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/UnaryTree;TP;)TR; +method name visitVariable descriptor (Lorg/openjdk/nashorn/api/tree/VariableTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/VariableTree;TP;)TR; +method name visitWhileLoop descriptor (Lorg/openjdk/nashorn/api/tree/WhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/WhileLoopTree;TP;)TR; +method name visitWith descriptor (Lorg/openjdk/nashorn/api/tree/WithTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/WithTree;TP;)TR; +method name visitYield descriptor (Lorg/openjdk/nashorn/api/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/YieldTree;TP;)TR; +method name visitUnknown descriptor (Lorg/openjdk/nashorn/api/tree/Tree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/Tree;TP;)TR; + +class name org/openjdk/nashorn/api/tree/SimpleTreeVisitorES6 +header extends org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1 flags 21 signature Lorg/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1; innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 method name descriptor ()V flags 1 -method name visitCompilationUnit descriptor (Ljdk/nashorn/api/tree/CompilationUnitTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/CompilationUnitTree;TP;)TR; -method name visitModule descriptor (Ljdk/nashorn/api/tree/ModuleTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ModuleTree;TP;)TR; -method name visitExportEntry descriptor (Ljdk/nashorn/api/tree/ExportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ExportEntryTree;TP;)TR; -method name visitImportEntry descriptor (Ljdk/nashorn/api/tree/ImportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ImportEntryTree;TP;)TR; -method name visitClassDeclaration descriptor (Ljdk/nashorn/api/tree/ClassDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ClassDeclarationTree;TP;)TR; -method name visitClassExpression descriptor (Ljdk/nashorn/api/tree/ClassExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ClassExpressionTree;TP;)TR; -method name visitForOfLoop descriptor (Ljdk/nashorn/api/tree/ForOfLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/ForOfLoopTree;TP;)TR; -method name visitYield descriptor (Ljdk/nashorn/api/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/YieldTree;TP;)TR; -method name visitSpread descriptor (Ljdk/nashorn/api/tree/SpreadTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/SpreadTree;TP;)TR; -method name visitTemplateLiteral descriptor (Ljdk/nashorn/api/tree/TemplateLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/TemplateLiteralTree;TP;)TR; -method name visitVariable descriptor (Ljdk/nashorn/api/tree/VariableTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Ljdk/nashorn/api/tree/VariableTree;TP;)TR; - -class name jdk/nashorn/api/tree/SpreadTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/StatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 - -class name jdk/nashorn/api/tree/SwitchTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getCases descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/CaseTree;>; - -class name jdk/nashorn/api/tree/TemplateLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpressions descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/ExpressionTree;>; - -class name jdk/nashorn/api/tree/ThrowTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/Tree +method name visitCompilationUnit descriptor (Lorg/openjdk/nashorn/api/tree/CompilationUnitTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/CompilationUnitTree;TP;)TR; +method name visitModule descriptor (Lorg/openjdk/nashorn/api/tree/ModuleTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ModuleTree;TP;)TR; +method name visitExportEntry descriptor (Lorg/openjdk/nashorn/api/tree/ExportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ExportEntryTree;TP;)TR; +method name visitImportEntry descriptor (Lorg/openjdk/nashorn/api/tree/ImportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ImportEntryTree;TP;)TR; +method name visitClassDeclaration descriptor (Lorg/openjdk/nashorn/api/tree/ClassDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ClassDeclarationTree;TP;)TR; +method name visitClassExpression descriptor (Lorg/openjdk/nashorn/api/tree/ClassExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ClassExpressionTree;TP;)TR; +method name visitForOfLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForOfLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/ForOfLoopTree;TP;)TR; +method name visitYield descriptor (Lorg/openjdk/nashorn/api/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/YieldTree;TP;)TR; +method name visitSpread descriptor (Lorg/openjdk/nashorn/api/tree/SpreadTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/SpreadTree;TP;)TR; +method name visitTemplateLiteral descriptor (Lorg/openjdk/nashorn/api/tree/TemplateLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/TemplateLiteralTree;TP;)TR; +method name visitVariable descriptor (Lorg/openjdk/nashorn/api/tree/VariableTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (Lorg/openjdk/nashorn/api/tree/VariableTree;TP;)TR; + +class name org/openjdk/nashorn/api/tree/SpreadTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/StatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 + +class name org/openjdk/nashorn/api/tree/SwitchTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getCases descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/CaseTree;>; + +class name org/openjdk/nashorn/api/tree/TemplateLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpressions descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/ExpressionTree;>; + +class name org/openjdk/nashorn/api/tree/ThrowTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/Tree header extends java/lang/Object flags 601 -innerclass innerClass jdk/nashorn/api/tree/Tree$Kind outerClass jdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 +innerclass innerClass org/openjdk/nashorn/api/tree/Tree$Kind outerClass org/openjdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 method name getStartPosition descriptor ()J flags 401 method name getEndPosition descriptor ()J flags 401 -method name getKind descriptor ()Ljdk/nashorn/api/tree/Tree$Kind; flags 401 -method name accept descriptor (Ljdk/nashorn/api/tree/TreeVisitor;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/TreeVisitor;TD;)TR; - -class name jdk/nashorn/api/tree/Tree$Kind -header extends java/lang/Enum flags 4031 signature Ljava/lang/Enum; -innerclass innerClass jdk/nashorn/api/tree/Tree$Kind outerClass jdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 -field name ARRAY_ACCESS descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name ARRAY_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name BLOCK descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name BREAK descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CLASS descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CLASS_EXPRESSION descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CASE descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CATCH descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name COMPILATION_UNIT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CONDITIONAL_EXPRESSION descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CONTINUE descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name DO_WHILE_LOOP descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name DEBUGGER descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name FOR_IN_LOOP descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name FUNCTION_EXPRESSION descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name ERROR descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name EXPRESSION_STATEMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name MEMBER_SELECT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name FOR_LOOP descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name IDENTIFIER descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name IF descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name INSTANCE_OF descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name LABELED_STATEMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name MODULE descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name EXPORT_ENTRY descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name IMPORT_ENTRY descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name FUNCTION descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name FUNCTION_INVOCATION descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name NEW descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name OBJECT_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name PARENTHESIZED descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name PROPERTY descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name REGEXP_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name TEMPLATE_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name RETURN descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name EMPTY_STATEMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name SWITCH descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name THROW descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name TRY descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name VARIABLE descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name WHILE_LOOP descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name WITH descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name POSTFIX_INCREMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name POSTFIX_DECREMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name PREFIX_INCREMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name PREFIX_DECREMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name UNARY_PLUS descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name UNARY_MINUS descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name BITWISE_COMPLEMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name LOGICAL_COMPLEMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name DELETE descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name TYPEOF descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name VOID descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name COMMA descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name MULTIPLY descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name DIVIDE descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name REMAINDER descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name PLUS descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name MINUS descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name LEFT_SHIFT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name RIGHT_SHIFT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name UNSIGNED_RIGHT_SHIFT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name LESS_THAN descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name GREATER_THAN descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name LESS_THAN_EQUAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name GREATER_THAN_EQUAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name IN descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name EQUAL_TO descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name NOT_EQUAL_TO descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name STRICT_EQUAL_TO descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name STRICT_NOT_EQUAL_TO descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name AND descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name XOR descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name OR descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CONDITIONAL_AND descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name CONDITIONAL_OR descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name MULTIPLY_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name DIVIDE_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name REMAINDER_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name PLUS_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name MINUS_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name LEFT_SHIFT_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name RIGHT_SHIFT_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name UNSIGNED_RIGHT_SHIFT_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name AND_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name XOR_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name OR_ASSIGNMENT descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name SPREAD descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name YIELD descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name NUMBER_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name BOOLEAN_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name STRING_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name NULL_LITERAL descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -field name OTHER descriptor Ljdk/nashorn/api/tree/Tree$Kind; flags 4019 -method name values descriptor ()[Ljdk/nashorn/api/tree/Tree$Kind; flags 9 -method name valueOf descriptor (Ljava/lang/String;)Ljdk/nashorn/api/tree/Tree$Kind; flags 9 -method name asInterface descriptor ()Ljava/lang/Class; flags 1 signature ()Ljava/lang/Class<+Ljdk/nashorn/api/tree/Tree;>; +method name getKind descriptor ()Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 401 +method name accept descriptor (Lorg/openjdk/nashorn/api/tree/TreeVisitor;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/TreeVisitor;TD;)TR; + +class name org/openjdk/nashorn/api/tree/Tree$Kind +header extends java/lang/Enum flags 4031 signature Ljava/lang/Enum; +innerclass innerClass org/openjdk/nashorn/api/tree/Tree$Kind outerClass org/openjdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 +field name ARRAY_ACCESS descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name ARRAY_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name BLOCK descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name BREAK descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CLASS descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CLASS_EXPRESSION descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CASE descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CATCH descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name COMPILATION_UNIT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CONDITIONAL_EXPRESSION descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CONTINUE descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name DO_WHILE_LOOP descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name DEBUGGER descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name FOR_IN_LOOP descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name FUNCTION_EXPRESSION descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name ERROR descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name EXPRESSION_STATEMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name MEMBER_SELECT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name FOR_LOOP descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name IDENTIFIER descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name IF descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name INSTANCE_OF descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name LABELED_STATEMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name MODULE descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name EXPORT_ENTRY descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name IMPORT_ENTRY descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name FUNCTION descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name FUNCTION_INVOCATION descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name NEW descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name OBJECT_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name PARENTHESIZED descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name PROPERTY descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name REGEXP_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name TEMPLATE_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name RETURN descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name EMPTY_STATEMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name SWITCH descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name THROW descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name TRY descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name VARIABLE descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name WHILE_LOOP descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name WITH descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name POSTFIX_INCREMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name POSTFIX_DECREMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name PREFIX_INCREMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name PREFIX_DECREMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name UNARY_PLUS descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name UNARY_MINUS descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name BITWISE_COMPLEMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name LOGICAL_COMPLEMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name DELETE descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name TYPEOF descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name VOID descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name COMMA descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name MULTIPLY descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name DIVIDE descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name REMAINDER descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name PLUS descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name MINUS descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name LEFT_SHIFT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name RIGHT_SHIFT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name UNSIGNED_RIGHT_SHIFT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name LESS_THAN descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name GREATER_THAN descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name LESS_THAN_EQUAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name GREATER_THAN_EQUAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name IN descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name EQUAL_TO descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name NOT_EQUAL_TO descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name STRICT_EQUAL_TO descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name STRICT_NOT_EQUAL_TO descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name AND descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name XOR descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name OR descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CONDITIONAL_AND descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name CONDITIONAL_OR descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name MULTIPLY_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name DIVIDE_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name REMAINDER_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name PLUS_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name MINUS_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name LEFT_SHIFT_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name RIGHT_SHIFT_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name UNSIGNED_RIGHT_SHIFT_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name AND_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name XOR_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name OR_ASSIGNMENT descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name SPREAD descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name YIELD descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name NUMBER_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name BOOLEAN_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name STRING_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name NULL_LITERAL descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +field name OTHER descriptor Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 4019 +method name values descriptor ()[Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 9 +method name valueOf descriptor (Ljava/lang/String;)Lorg/openjdk/nashorn/api/tree/Tree$Kind; flags 9 +method name asInterface descriptor ()Ljava/lang/Class; flags 1 signature ()Ljava/lang/Class<+Lorg/openjdk/nashorn/api/tree/Tree;>; method name isLiteral descriptor ()Z flags 1 method name isExpression descriptor ()Z flags 1 method name isStatement descriptor ()Z flags 1 -class name jdk/nashorn/api/tree/TreeVisitor +class name org/openjdk/nashorn/api/tree/TreeVisitor header extends java/lang/Object flags 601 signature Ljava/lang/Object; -method name visitAssignment descriptor (Ljdk/nashorn/api/tree/AssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/AssignmentTree;TP;)TR; -method name visitCompoundAssignment descriptor (Ljdk/nashorn/api/tree/CompoundAssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/CompoundAssignmentTree;TP;)TR; -method name visitBinary descriptor (Ljdk/nashorn/api/tree/BinaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/BinaryTree;TP;)TR; -method name visitBlock descriptor (Ljdk/nashorn/api/tree/BlockTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/BlockTree;TP;)TR; -method name visitBreak descriptor (Ljdk/nashorn/api/tree/BreakTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/BreakTree;TP;)TR; -method name visitCase descriptor (Ljdk/nashorn/api/tree/CaseTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/CaseTree;TP;)TR; -method name visitCatch descriptor (Ljdk/nashorn/api/tree/CatchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/CatchTree;TP;)TR; -method name visitClassDeclaration descriptor (Ljdk/nashorn/api/tree/ClassDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ClassDeclarationTree;TP;)TR; -method name visitClassExpression descriptor (Ljdk/nashorn/api/tree/ClassExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ClassExpressionTree;TP;)TR; -method name visitConditionalExpression descriptor (Ljdk/nashorn/api/tree/ConditionalExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ConditionalExpressionTree;TP;)TR; -method name visitContinue descriptor (Ljdk/nashorn/api/tree/ContinueTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ContinueTree;TP;)TR; -method name visitDebugger descriptor (Ljdk/nashorn/api/tree/DebuggerTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/DebuggerTree;TP;)TR; -method name visitDoWhileLoop descriptor (Ljdk/nashorn/api/tree/DoWhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/DoWhileLoopTree;TP;)TR; -method name visitErroneous descriptor (Ljdk/nashorn/api/tree/ErroneousTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ErroneousTree;TP;)TR; -method name visitExpressionStatement descriptor (Ljdk/nashorn/api/tree/ExpressionStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ExpressionStatementTree;TP;)TR; -method name visitForLoop descriptor (Ljdk/nashorn/api/tree/ForLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ForLoopTree;TP;)TR; -method name visitForInLoop descriptor (Ljdk/nashorn/api/tree/ForInLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ForInLoopTree;TP;)TR; -method name visitForOfLoop descriptor (Ljdk/nashorn/api/tree/ForOfLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ForOfLoopTree;TP;)TR; -method name visitFunctionCall descriptor (Ljdk/nashorn/api/tree/FunctionCallTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/FunctionCallTree;TP;)TR; -method name visitFunctionDeclaration descriptor (Ljdk/nashorn/api/tree/FunctionDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/FunctionDeclarationTree;TP;)TR; -method name visitFunctionExpression descriptor (Ljdk/nashorn/api/tree/FunctionExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/FunctionExpressionTree;TP;)TR; -method name visitIdentifier descriptor (Ljdk/nashorn/api/tree/IdentifierTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/IdentifierTree;TP;)TR; -method name visitIf descriptor (Ljdk/nashorn/api/tree/IfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/IfTree;TP;)TR; -method name visitArrayAccess descriptor (Ljdk/nashorn/api/tree/ArrayAccessTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ArrayAccessTree;TP;)TR; -method name visitArrayLiteral descriptor (Ljdk/nashorn/api/tree/ArrayLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ArrayLiteralTree;TP;)TR; -method name visitLabeledStatement descriptor (Ljdk/nashorn/api/tree/LabeledStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/LabeledStatementTree;TP;)TR; -method name visitLiteral descriptor (Ljdk/nashorn/api/tree/LiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/LiteralTree;TP;)TR; -method name visitParenthesized descriptor (Ljdk/nashorn/api/tree/ParenthesizedTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ParenthesizedTree;TP;)TR; -method name visitReturn descriptor (Ljdk/nashorn/api/tree/ReturnTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ReturnTree;TP;)TR; -method name visitMemberSelect descriptor (Ljdk/nashorn/api/tree/MemberSelectTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/MemberSelectTree;TP;)TR; -method name visitNew descriptor (Ljdk/nashorn/api/tree/NewTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/NewTree;TP;)TR; -method name visitObjectLiteral descriptor (Ljdk/nashorn/api/tree/ObjectLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ObjectLiteralTree;TP;)TR; -method name visitProperty descriptor (Ljdk/nashorn/api/tree/PropertyTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/PropertyTree;TP;)TR; -method name visitRegExpLiteral descriptor (Ljdk/nashorn/api/tree/RegExpLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/RegExpLiteralTree;TP;)TR; -method name visitTemplateLiteral descriptor (Ljdk/nashorn/api/tree/TemplateLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/TemplateLiteralTree;TP;)TR; -method name visitEmptyStatement descriptor (Ljdk/nashorn/api/tree/EmptyStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/EmptyStatementTree;TP;)TR; -method name visitSpread descriptor (Ljdk/nashorn/api/tree/SpreadTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/SpreadTree;TP;)TR; -method name visitSwitch descriptor (Ljdk/nashorn/api/tree/SwitchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/SwitchTree;TP;)TR; -method name visitThrow descriptor (Ljdk/nashorn/api/tree/ThrowTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ThrowTree;TP;)TR; -method name visitCompilationUnit descriptor (Ljdk/nashorn/api/tree/CompilationUnitTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/CompilationUnitTree;TP;)TR; -method name visitModule descriptor (Ljdk/nashorn/api/tree/ModuleTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ModuleTree;TP;)TR; -method name visitExportEntry descriptor (Ljdk/nashorn/api/tree/ExportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ExportEntryTree;TP;)TR; -method name visitImportEntry descriptor (Ljdk/nashorn/api/tree/ImportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/ImportEntryTree;TP;)TR; -method name visitTry descriptor (Ljdk/nashorn/api/tree/TryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/TryTree;TP;)TR; -method name visitInstanceOf descriptor (Ljdk/nashorn/api/tree/InstanceOfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/InstanceOfTree;TP;)TR; -method name visitUnary descriptor (Ljdk/nashorn/api/tree/UnaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/UnaryTree;TP;)TR; -method name visitVariable descriptor (Ljdk/nashorn/api/tree/VariableTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/VariableTree;TP;)TR; -method name visitWhileLoop descriptor (Ljdk/nashorn/api/tree/WhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/WhileLoopTree;TP;)TR; -method name visitWith descriptor (Ljdk/nashorn/api/tree/WithTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/WithTree;TP;)TR; -method name visitYield descriptor (Ljdk/nashorn/api/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/YieldTree;TP;)TR; -method name visitUnknown descriptor (Ljdk/nashorn/api/tree/Tree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Ljdk/nashorn/api/tree/Tree;TP;)TR; - -class name jdk/nashorn/api/tree/TryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getBlock descriptor ()Ljdk/nashorn/api/tree/BlockTree; flags 401 -method name getCatches descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Ljdk/nashorn/api/tree/CatchTree;>; -method name getFinallyBlock descriptor ()Ljdk/nashorn/api/tree/BlockTree; flags 401 - -class name jdk/nashorn/api/tree/UnaryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 - -class name jdk/nashorn/api/tree/UnknownTreeException +method name visitAssignment descriptor (Lorg/openjdk/nashorn/api/tree/AssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/AssignmentTree;TP;)TR; +method name visitCompoundAssignment descriptor (Lorg/openjdk/nashorn/api/tree/CompoundAssignmentTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/CompoundAssignmentTree;TP;)TR; +method name visitBinary descriptor (Lorg/openjdk/nashorn/api/tree/BinaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/BinaryTree;TP;)TR; +method name visitBlock descriptor (Lorg/openjdk/nashorn/api/tree/BlockTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/BlockTree;TP;)TR; +method name visitBreak descriptor (Lorg/openjdk/nashorn/api/tree/BreakTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/BreakTree;TP;)TR; +method name visitCase descriptor (Lorg/openjdk/nashorn/api/tree/CaseTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/CaseTree;TP;)TR; +method name visitCatch descriptor (Lorg/openjdk/nashorn/api/tree/CatchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/CatchTree;TP;)TR; +method name visitClassDeclaration descriptor (Lorg/openjdk/nashorn/api/tree/ClassDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ClassDeclarationTree;TP;)TR; +method name visitClassExpression descriptor (Lorg/openjdk/nashorn/api/tree/ClassExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ClassExpressionTree;TP;)TR; +method name visitConditionalExpression descriptor (Lorg/openjdk/nashorn/api/tree/ConditionalExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ConditionalExpressionTree;TP;)TR; +method name visitContinue descriptor (Lorg/openjdk/nashorn/api/tree/ContinueTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ContinueTree;TP;)TR; +method name visitDebugger descriptor (Lorg/openjdk/nashorn/api/tree/DebuggerTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/DebuggerTree;TP;)TR; +method name visitDoWhileLoop descriptor (Lorg/openjdk/nashorn/api/tree/DoWhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/DoWhileLoopTree;TP;)TR; +method name visitErroneous descriptor (Lorg/openjdk/nashorn/api/tree/ErroneousTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ErroneousTree;TP;)TR; +method name visitExpressionStatement descriptor (Lorg/openjdk/nashorn/api/tree/ExpressionStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ExpressionStatementTree;TP;)TR; +method name visitForLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ForLoopTree;TP;)TR; +method name visitForInLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForInLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ForInLoopTree;TP;)TR; +method name visitForOfLoop descriptor (Lorg/openjdk/nashorn/api/tree/ForOfLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ForOfLoopTree;TP;)TR; +method name visitFunctionCall descriptor (Lorg/openjdk/nashorn/api/tree/FunctionCallTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/FunctionCallTree;TP;)TR; +method name visitFunctionDeclaration descriptor (Lorg/openjdk/nashorn/api/tree/FunctionDeclarationTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/FunctionDeclarationTree;TP;)TR; +method name visitFunctionExpression descriptor (Lorg/openjdk/nashorn/api/tree/FunctionExpressionTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/FunctionExpressionTree;TP;)TR; +method name visitIdentifier descriptor (Lorg/openjdk/nashorn/api/tree/IdentifierTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/IdentifierTree;TP;)TR; +method name visitIf descriptor (Lorg/openjdk/nashorn/api/tree/IfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/IfTree;TP;)TR; +method name visitArrayAccess descriptor (Lorg/openjdk/nashorn/api/tree/ArrayAccessTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ArrayAccessTree;TP;)TR; +method name visitArrayLiteral descriptor (Lorg/openjdk/nashorn/api/tree/ArrayLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ArrayLiteralTree;TP;)TR; +method name visitLabeledStatement descriptor (Lorg/openjdk/nashorn/api/tree/LabeledStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/LabeledStatementTree;TP;)TR; +method name visitLiteral descriptor (Lorg/openjdk/nashorn/api/tree/LiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/LiteralTree;TP;)TR; +method name visitParenthesized descriptor (Lorg/openjdk/nashorn/api/tree/ParenthesizedTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ParenthesizedTree;TP;)TR; +method name visitReturn descriptor (Lorg/openjdk/nashorn/api/tree/ReturnTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ReturnTree;TP;)TR; +method name visitMemberSelect descriptor (Lorg/openjdk/nashorn/api/tree/MemberSelectTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/MemberSelectTree;TP;)TR; +method name visitNew descriptor (Lorg/openjdk/nashorn/api/tree/NewTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/NewTree;TP;)TR; +method name visitObjectLiteral descriptor (Lorg/openjdk/nashorn/api/tree/ObjectLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ObjectLiteralTree;TP;)TR; +method name visitProperty descriptor (Lorg/openjdk/nashorn/api/tree/PropertyTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/PropertyTree;TP;)TR; +method name visitRegExpLiteral descriptor (Lorg/openjdk/nashorn/api/tree/RegExpLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/RegExpLiteralTree;TP;)TR; +method name visitTemplateLiteral descriptor (Lorg/openjdk/nashorn/api/tree/TemplateLiteralTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/TemplateLiteralTree;TP;)TR; +method name visitEmptyStatement descriptor (Lorg/openjdk/nashorn/api/tree/EmptyStatementTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/EmptyStatementTree;TP;)TR; +method name visitSpread descriptor (Lorg/openjdk/nashorn/api/tree/SpreadTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/SpreadTree;TP;)TR; +method name visitSwitch descriptor (Lorg/openjdk/nashorn/api/tree/SwitchTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/SwitchTree;TP;)TR; +method name visitThrow descriptor (Lorg/openjdk/nashorn/api/tree/ThrowTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ThrowTree;TP;)TR; +method name visitCompilationUnit descriptor (Lorg/openjdk/nashorn/api/tree/CompilationUnitTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/CompilationUnitTree;TP;)TR; +method name visitModule descriptor (Lorg/openjdk/nashorn/api/tree/ModuleTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ModuleTree;TP;)TR; +method name visitExportEntry descriptor (Lorg/openjdk/nashorn/api/tree/ExportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ExportEntryTree;TP;)TR; +method name visitImportEntry descriptor (Lorg/openjdk/nashorn/api/tree/ImportEntryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/ImportEntryTree;TP;)TR; +method name visitTry descriptor (Lorg/openjdk/nashorn/api/tree/TryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/TryTree;TP;)TR; +method name visitInstanceOf descriptor (Lorg/openjdk/nashorn/api/tree/InstanceOfTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/InstanceOfTree;TP;)TR; +method name visitUnary descriptor (Lorg/openjdk/nashorn/api/tree/UnaryTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/UnaryTree;TP;)TR; +method name visitVariable descriptor (Lorg/openjdk/nashorn/api/tree/VariableTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/VariableTree;TP;)TR; +method name visitWhileLoop descriptor (Lorg/openjdk/nashorn/api/tree/WhileLoopTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/WhileLoopTree;TP;)TR; +method name visitWith descriptor (Lorg/openjdk/nashorn/api/tree/WithTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/WithTree;TP;)TR; +method name visitYield descriptor (Lorg/openjdk/nashorn/api/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/YieldTree;TP;)TR; +method name visitUnknown descriptor (Lorg/openjdk/nashorn/api/tree/Tree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (Lorg/openjdk/nashorn/api/tree/Tree;TP;)TR; + +class name org/openjdk/nashorn/api/tree/TryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getBlock descriptor ()Lorg/openjdk/nashorn/api/tree/BlockTree; flags 401 +method name getCatches descriptor ()Ljava/util/List; flags 401 signature ()Ljava/util/List<+Lorg/openjdk/nashorn/api/tree/CatchTree;>; +method name getFinallyBlock descriptor ()Lorg/openjdk/nashorn/api/tree/BlockTree; flags 401 + +class name org/openjdk/nashorn/api/tree/UnaryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 + +class name org/openjdk/nashorn/api/tree/UnknownTreeException header extends java/lang/RuntimeException flags 21 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -method name descriptor (Ljdk/nashorn/api/tree/Tree;Ljava/lang/Object;)V flags 1 -method name getUnknownTree descriptor ()Ljdk/nashorn/api/tree/Tree; flags 1 +method name descriptor (Lorg/openjdk/nashorn/api/tree/Tree;Ljava/lang/Object;)V flags 1 +method name getUnknownTree descriptor ()Lorg/openjdk/nashorn/api/tree/Tree; flags 1 method name getArgument descriptor ()Ljava/lang/Object; flags 1 -class name jdk/nashorn/api/tree/VariableTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getBinding descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getInitializer descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/VariableTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getBinding descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getInitializer descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 method name isConst descriptor ()Z flags 401 method name isLet descriptor ()Z flags 401 -class name jdk/nashorn/api/tree/WhileLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ConditionalLoopTree flags 601 -method name getCondition descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 +class name org/openjdk/nashorn/api/tree/WhileLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ConditionalLoopTree flags 601 +method name getCondition descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 -class name jdk/nashorn/api/tree/WithTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 -method name getScope descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 -method name getStatement descriptor ()Ljdk/nashorn/api/tree/StatementTree; flags 401 +class name org/openjdk/nashorn/api/tree/WithTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 +method name getScope descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 +method name getStatement descriptor ()Lorg/openjdk/nashorn/api/tree/StatementTree; flags 401 -class name jdk/nashorn/api/tree/YieldTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 -method name getExpression descriptor ()Ljdk/nashorn/api/tree/ExpressionTree; flags 401 +class name org/openjdk/nashorn/api/tree/YieldTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 +method name getExpression descriptor ()Lorg/openjdk/nashorn/api/tree/ExpressionTree; flags 401 method name isStar descriptor ()Z flags 401 diff --git a/make/data/symbols/jdk.scripting.nashorn-A.sym.txt b/make/data/symbols/jdk.scripting.nashorn-A.sym.txt index 66afc4999..1c11c1916 100644 --- a/make/data/symbols/jdk.scripting.nashorn-A.sym.txt +++ b/make/data/symbols/jdk.scripting.nashorn-A.sym.txt @@ -26,6 +26,6 @@ # ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ### # ########################################################## # -module name jdk.scripting.nashorn -header exports jdk/nashorn/api/scripting,jdk/nashorn/api/tree requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.logging\u0020;flags\u0020;0,name\u0020;jdk.dynalink\u0020;flags\u0020;0,name\u0020;java.scripting\u0020;flags\u0020;20 provides interface\u0020;javax/script/ScriptEngineFactory\u0020;impls\u0020;jdk/nashorn/api/scripting/NashornScriptEngineFactory,interface\u0020;jdk/dynalink/linker/GuardingDynamicLinkerExporter\u0020;impls\u0020;jdk/nashorn/api/linker/NashornLinkerExporter target linux-amd64 flags 8000 +module name org.openjdk.nashorn +header exports org/openjdk/nashorn/api/scripting,org/openjdk/nashorn/api/tree requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.logging\u0020;flags\u0020;0,name\u0020;jdk.dynalink\u0020;flags\u0020;0,name\u0020;java.scripting\u0020;flags\u0020;20 provides interface\u0020;javax/script/ScriptEngineFactory\u0020;impls\u0020;org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory,interface\u0020;jdk/dynalink/linker/GuardingDynamicLinkerExporter\u0020;impls\u0020;org/openjdk/nashorn/api/linker/NashornLinkerExporter target linux-amd64 flags 8000 diff --git a/make/data/symbols/jdk.scripting.nashorn-B.sym.txt b/make/data/symbols/jdk.scripting.nashorn-B.sym.txt index c658808f1..50ec4630f 100644 --- a/make/data/symbols/jdk.scripting.nashorn-B.sym.txt +++ b/make/data/symbols/jdk.scripting.nashorn-B.sym.txt @@ -26,243 +26,243 @@ # ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ### # ########################################################## # -module name jdk.scripting.nashorn -header exports jdk/nashorn/api/scripting,jdk/nashorn/api/tree requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.logging\u0020;flags\u0020;0,name\u0020;jdk.dynalink\u0020;flags\u0020;0,name\u0020;java.scripting\u0020;flags\u0020;20 provides interface\u0020;javax/script/ScriptEngineFactory\u0020;impls\u0020;jdk/nashorn/api/scripting/NashornScriptEngineFactory,interface\u0020;jdk/dynalink/linker/GuardingDynamicLinkerExporter\u0020;impls\u0020;jdk/nashorn/api/linker/NashornLinkerExporter target linux-amd64 flags 8000 runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +module name org.openjdk.nashorn +header exports org/openjdk/nashorn/api/scripting,org/openjdk/nashorn/api/tree requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.logging\u0020;flags\u0020;0,name\u0020;jdk.dynalink\u0020;flags\u0020;0,name\u0020;java.scripting\u0020;flags\u0020;20 provides interface\u0020;javax/script/ScriptEngineFactory\u0020;impls\u0020;org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory,interface\u0020;jdk/dynalink/linker/GuardingDynamicLinkerExporter\u0020;impls\u0020;org/openjdk/nashorn/api/linker/NashornLinkerExporter target linux-amd64 flags 8000 runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/scripting/AbstractJSObject -header extends java/lang/Object implements jdk/nashorn/api/scripting/JSObject flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/scripting/AbstractJSObject +header extends java/lang/Object implements org/openjdk/nashorn/api/scripting/JSObject flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/scripting/ClassFilter +class name org/openjdk/nashorn/api/scripting/ClassFilter header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/scripting/JSObject +class name org/openjdk/nashorn/api/scripting/JSObject header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/scripting/NashornException +class name org/openjdk/nashorn/api/scripting/NashornException header extends java/lang/RuntimeException flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/NashornScriptEngine +class name org/openjdk/nashorn/api/scripting/NashornScriptEngine header extends javax/script/AbstractScriptEngine implements javax/script/Compilable,javax/script/Invocable flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/NashornScriptEngineFactory +class name org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory header extends java/lang/Object implements javax/script/ScriptEngineFactory flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/ScriptObjectMirror -header extends jdk/nashorn/api/scripting/AbstractJSObject implements javax/script/Bindings flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/scripting/ScriptObjectMirror +header extends org/openjdk/nashorn/api/scripting/AbstractJSObject implements javax/script/Bindings flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/scripting/ScriptUtils +class name org/openjdk/nashorn/api/scripting/ScriptUtils header extends java/lang/Object flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/scripting/URLReader +class name org/openjdk/nashorn/api/scripting/URLReader header extends java/io/Reader flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ArrayAccessTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ArrayAccessTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ArrayLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ArrayLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/AssignmentTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/AssignmentTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/BinaryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/BinaryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/BlockTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/BlockTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/BreakTree -header extends java/lang/Object implements jdk/nashorn/api/tree/GotoTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/BreakTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/GotoTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/CaseTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/CaseTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/CatchTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/CatchTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ClassDeclarationTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ClassDeclarationTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ClassExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ClassExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/CompilationUnitTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/CompilationUnitTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/CompoundAssignmentTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/CompoundAssignmentTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ConditionalExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ConditionalExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ConditionalLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/LoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ConditionalLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/LoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ContinueTree -header extends java/lang/Object implements jdk/nashorn/api/tree/GotoTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ContinueTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/GotoTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/DebuggerTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/DebuggerTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/Diagnostic -header extends java/lang/Object nestMembers jdk/nashorn/api/tree/Diagnostic$Kind flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -innerclass innerClass jdk/nashorn/api/tree/Diagnostic$Kind outerClass jdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 +class name org/openjdk/nashorn/api/tree/Diagnostic +header extends java/lang/Object nestMembers org/openjdk/nashorn/api/tree/Diagnostic$Kind flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +innerclass innerClass org/openjdk/nashorn/api/tree/Diagnostic$Kind outerClass org/openjdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 -class name jdk/nashorn/api/tree/Diagnostic$Kind -header extends java/lang/Enum nestHost jdk/nashorn/api/tree/Diagnostic flags 4031 deprecated true signature Ljava/lang/Enum; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -innerclass innerClass jdk/nashorn/api/tree/Diagnostic$Kind outerClass jdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 +class name org/openjdk/nashorn/api/tree/Diagnostic$Kind +header extends java/lang/Enum nestHost org/openjdk/nashorn/api/tree/Diagnostic flags 4031 deprecated true signature Ljava/lang/Enum; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +innerclass innerClass org/openjdk/nashorn/api/tree/Diagnostic$Kind outerClass org/openjdk/nashorn/api/tree/Diagnostic innerClassName Kind flags 4019 -class name jdk/nashorn/api/tree/DiagnosticListener +class name org/openjdk/nashorn/api/tree/DiagnosticListener header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11")@Ljava/lang/FunctionalInterface; -class name jdk/nashorn/api/tree/DoWhileLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ConditionalLoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/DoWhileLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ConditionalLoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/EmptyStatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/EmptyStatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ErroneousTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ErroneousTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ExportEntryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ExportEntryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ExpressionStatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ExpressionStatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ForInLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/LoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ForInLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/LoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ForLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ConditionalLoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ForLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ConditionalLoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ForOfLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/LoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ForOfLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/LoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/FunctionCallTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/FunctionCallTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/FunctionDeclarationTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/FunctionDeclarationTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/FunctionExpressionTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/FunctionExpressionTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/GotoTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/GotoTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/IdentifierTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/IdentifierTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/IfTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/IfTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ImportEntryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ImportEntryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/InstanceOfTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/InstanceOfTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/LabeledStatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/LabeledStatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/LineMap +class name org/openjdk/nashorn/api/tree/LineMap header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/LiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/LiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/LoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/LoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/MemberSelectTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/MemberSelectTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ModuleTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ModuleTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/NewTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/NewTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ObjectLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ObjectLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ParenthesizedTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ParenthesizedTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/Parser +class name org/openjdk/nashorn/api/tree/Parser header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/PropertyTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/PropertyTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/RegExpLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/RegExpLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ReturnTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ReturnTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/SimpleTreeVisitorES5_1 -header extends java/lang/Object implements jdk/nashorn/api/tree/TreeVisitor flags 21 deprecated true signature Ljava/lang/Object;Ljdk/nashorn/api/tree/TreeVisitor; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1 +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/TreeVisitor flags 21 deprecated true signature Ljava/lang/Object;Lorg/openjdk/nashorn/api/tree/TreeVisitor; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/tree/SimpleTreeVisitorES6 -header extends jdk/nashorn/api/tree/SimpleTreeVisitorES5_1 flags 21 deprecated true signature Ljdk/nashorn/api/tree/SimpleTreeVisitorES5_1; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/SimpleTreeVisitorES6 +header extends org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1 flags 21 deprecated true signature Lorg/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/tree/SpreadTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/SpreadTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/StatementTree -header extends java/lang/Object implements jdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/StatementTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/Tree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/SwitchTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/SwitchTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/TemplateLiteralTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/TemplateLiteralTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/ThrowTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/ThrowTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/Tree -header extends java/lang/Object nestMembers jdk/nashorn/api/tree/Tree$Kind flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -innerclass innerClass jdk/nashorn/api/tree/Tree$Kind outerClass jdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 +class name org/openjdk/nashorn/api/tree/Tree +header extends java/lang/Object nestMembers org/openjdk/nashorn/api/tree/Tree$Kind flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +innerclass innerClass org/openjdk/nashorn/api/tree/Tree$Kind outerClass org/openjdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 -class name jdk/nashorn/api/tree/Tree$Kind -header extends java/lang/Enum nestHost jdk/nashorn/api/tree/Tree flags 4031 deprecated true signature Ljava/lang/Enum; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -innerclass innerClass jdk/nashorn/api/tree/Tree$Kind outerClass jdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 +class name org/openjdk/nashorn/api/tree/Tree$Kind +header extends java/lang/Enum nestHost org/openjdk/nashorn/api/tree/Tree flags 4031 deprecated true signature Ljava/lang/Enum; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +innerclass innerClass org/openjdk/nashorn/api/tree/Tree$Kind outerClass org/openjdk/nashorn/api/tree/Tree innerClassName Kind flags 4019 -class name jdk/nashorn/api/tree/TreeVisitor +class name org/openjdk/nashorn/api/tree/TreeVisitor header extends java/lang/Object flags 601 deprecated true signature Ljava/lang/Object; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/TryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/TryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/UnaryTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/UnaryTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/UnknownTreeException +class name org/openjdk/nashorn/api/tree/UnknownTreeException header extends java/lang/RuntimeException flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19 -class name jdk/nashorn/api/tree/VariableTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/VariableTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/WhileLoopTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ConditionalLoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/WhileLoopTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ConditionalLoopTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/WithTree -header extends java/lang/Object implements jdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/WithTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") -class name jdk/nashorn/api/tree/YieldTree -header extends java/lang/Object implements jdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") +class name org/openjdk/nashorn/api/tree/YieldTree +header extends java/lang/Object implements org/openjdk/nashorn/api/tree/ExpressionTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="11") diff --git a/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk b/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk index 9dec093ee..cbc30a462 100644 --- a/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk +++ b/make/gensrc/Gensrc-jdk.scripting.nashorn.gmk @@ -32,7 +32,7 @@ include TextFileProcessing.gmk ################################################################################ # Version file needs to be processed with version numbers -VERSION_FILE := jdk/nashorn/internal/runtime/resources/version.properties +VERSION_FILE := org/openjdk/nashorn/internal/runtime/resources/version.properties $(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \ SOURCE_FILES := $(TOPDIR)/src/$(MODULE)/share/classes/$(VERSION_FILE).template, \ diff --git a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk index 82311e69f..1abae983c 100644 --- a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk +++ b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk @@ -26,7 +26,7 @@ include LauncherCommon.gmk $(eval $(call SetupBuildLauncher, jjs, \ - MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \ + MAIN_CLASS := org.openjdk.nashorn.tools.jjs.Main, \ JAVA_ARGS := --add-modules ALL-DEFAULT, \ CFLAGS := -DENABLE_ARG_FILES, \ )) diff --git a/make/nashorn/build-benchmark.xml b/make/nashorn/build-benchmark.xml index 84f48518e..4cc4cec1d 100644 --- a/make/nashorn/build-benchmark.xml +++ b/make/nashorn/build-benchmark.xml @@ -219,7 +219,7 @@ - diff --git a/make/nashorn/build-nasgen.xml b/make/nashorn/build-nasgen.xml index 4bd18d422..c2b828956 100644 --- a/make/nashorn/build-nasgen.xml +++ b/make/nashorn/build-nasgen.xml @@ -31,14 +31,16 @@ + + - + @@ -46,26 +48,26 @@ - + - + - - + + - - + + diff --git a/make/nashorn/build.xml b/make/nashorn/build.xml index cdd1c0e26..01e2827b1 100644 --- a/make/nashorn/build.xml +++ b/make/nashorn/build.xml @@ -31,7 +31,7 @@ - + @@ -52,6 +52,7 @@ + @@ -113,13 +114,13 @@ - - + + - + - + @@ -147,19 +148,30 @@ - - + + + + + + + + + + + + + @@ -171,36 +183,35 @@ - - - - - - - - - - - + + - - - - - + + + + + + + + + + + + + ${line.separator} + + + + - + + - - - - - - - - - + + - - - - - - - - - - - ${line.separator} - - - - - + @@ -247,91 +237,57 @@ -
+
+ + + - - - - - + - + - - - - - - + additionalparam="-quiet" failonerror="true" useexternalfile="true" + sourcepath="${nashorn.module.src.dir}" modulenames="org.openjdk.nashorn" + packagenames="org.openjdk.nashorn.api.scripting,org.openjdk.nashorn.api.tree" + modulepath="${deps.dir}"> - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + @@ -342,7 +298,8 @@ debug="${javac.debug}" encoding="${javac.encoding}" includeantruntime="false" fork="true"> - + + @@ -353,16 +310,16 @@ - - + + - - + + - - + + @@ -370,13 +327,13 @@ - + - + @@ -392,19 +349,21 @@ package.access=sun.misc.,\ sun.reflect.,\ - jdk.nashorn.internal. + org.openjdk.nashorn.internal.test + + -grant codeBase "file:/${basedir}/${dynalink.module.classes.dir}" { +grant codeBase "file:/${basedir}/${nashorn.jar}" { permission java.security.AllPermission; }; -grant codeBase "file:/${basedir}/${nashorn.module.classes.dir}" { +grant codeBase "file:/${basedir}/${jjs.jar}" { permission java.security.AllPermission; }; @@ -451,7 +410,6 @@ grant codeBase "file:/${file.reference.snakeyaml.jar}" { permission java.security.AllPermission; }; - grant codeBase "file:/${basedir}/${test.script.dir}/trusted/*" { permission java.security.AllPermission; }; @@ -734,7 +692,7 @@ grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" { - - - - - + + + + diff --git a/make/nashorn/buildtools/nasgen/nasgen.iml b/make/nashorn/buildtools/nasgen/nasgen.iml index f6c890a2d..1884a654b 100644 --- a/make/nashorn/buildtools/nasgen/nasgen.iml +++ b/make/nashorn/buildtools/nasgen/nasgen.iml @@ -33,7 +33,7 @@ - + diff --git a/make/nashorn/buildtools/nasgen/project.properties b/make/nashorn/buildtools/nasgen/project.properties index fcec900fd..dda1cc68c 100644 --- a/make/nashorn/buildtools/nasgen/project.properties +++ b/make/nashorn/buildtools/nasgen/project.properties @@ -26,6 +26,7 @@ application.title=nasgen build.compiler=modern # This directory is removed when the project is cleaned: +nasgen.modules.dir=../../../../build/nashorn/dependencies nasgen.build.dir=../../../../build/nashorn/nasgen nasgen.build.classes.dir=${nasgen.build.dir}/classes @@ -37,8 +38,9 @@ nasgen.dist.javadoc.dir=${nasgen.dist.dir}/javadoc javac.debug=true nasgen.module.imports=\ - --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \ - --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED + --module-path ${nasgen.modules.dir} \ + --add-modules org.objectweb.asm \ + --add-modules org.objectweb.asm.util meta.inf.dir=${src.dir}/META-INF run.classpath=\ diff --git a/make/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF b/make/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF index b70986369..3d81ec8e4 100644 --- a/make/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF +++ b/make/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Class-Path: lib/ant-1.7.1.jar -Main-Class: jdk.nashorn.internal.tools.nasgen.Main +Main-Class: org.openjdk.nashorn.internal.tools.nasgen.Main diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ClassGenerator.java similarity index 77% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ClassGenerator.java index 98a11d984..50c3da395 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ClassGenerator.java @@ -23,63 +23,63 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; - -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_EMPTY_LIST; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.GETTER_PREFIX; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.LIST_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.NATIVESYMBOL_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_CREATEBUILTIN; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_CREATEBUILTIN_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_CREATEBUILTIN_SPECS_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SETTER_PREFIX; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SYMBOL_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SYMBOL_PREFIX; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_OBJECT; +package org.openjdk.nashorn.internal.tools.nasgen; + +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; +import static org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_CREATE_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.ACCESSORPROPERTY_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_INIT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.ARRAYLIST_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_EMPTY_LIST; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTIONS_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_ADD_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.COLLECTION_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.GETTER_PREFIX; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.LIST_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.NATIVESYMBOL_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_NEWMAP_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_CREATEBUILTIN; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_CREATEBUILTIN_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_CREATEBUILTIN_SPECS_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SETTER_PREFIX; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SYMBOL_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SYMBOL_PREFIX; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_OBJECT; import java.io.BufferedInputStream; import java.io.FileInputStream; import java.io.IOException; import java.util.List; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Type; -import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; +import org.openjdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; /** * Base class for class generator classes. diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java similarity index 81% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java index 1fa76ce98..009880ef3 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java @@ -23,37 +23,37 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_7; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.CONSTRUCTOR_SUFFIX; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_INIT_DESC3; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_INIT_DESC4; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETPROTOTYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETPROTOTYPE_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE; +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; +import static org.objectweb.asm.Opcodes.V1_7; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.CONSTRUCTOR_SUFFIX; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_INIT_DESC3; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_INIT_DESC4; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETDOCUMENTATIONKEY_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETPROTOTYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETPROTOTYPE_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE; import java.io.FileOutputStream; import java.io.IOException; import java.util.List; -import jdk.internal.org.objectweb.asm.Handle; +import org.objectweb.asm.Handle; /** * This class generates constructor class for a @ScriptClass annotated class. diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/Main.java similarity index 96% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/Main.java index 90dbcc484..e6d7db971 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/Main.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.util.CheckClassAdapter; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.util.CheckClassAdapter; /** * Main class for the "nasgen" tool. diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/MemberInfo.java similarity index 95% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/MemberInfo.java index c5cb0b5de..fa208601e 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/MemberInfo.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_ARRAY_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJ_PKG; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.RUNTIME_PKG; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTS_PKG; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.STRING_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_SYMBOL; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_ARRAY_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJ_PKG; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.RUNTIME_PKG; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTS_PKG; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.STRING_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_SYMBOL; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; /** * Details about a Java method or field annotated with any of the field/method - * annotations from the jdk.nashorn.internal.objects.annotations package. + * annotations from the org.openjdk.nashorn.internal.objects.annotations package. */ public final class MemberInfo implements Cloneable { // class loader of this class @@ -78,7 +78,7 @@ public static enum Kind { SPECIALIZED_FUNCTION, } - // keep in sync with jdk.nashorn.internal.objects.annotations.Attribute + // keep in sync with org.openjdk.nashorn.internal.objects.annotations.Attribute static final int DEFAULT_ATTRIBUTES = 0x0; static final int DEFAULT_ARITY = -2; diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/MethodGenerator.java similarity index 75% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/MethodGenerator.java index e69f03644..005e6f176 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/MethodGenerator.java @@ -23,69 +23,69 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; - -import static jdk.internal.org.objectweb.asm.Opcodes.AALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.AASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ANEWARRAY; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.BALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.BASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.BIPUSH; -import static jdk.internal.org.objectweb.asm.Opcodes.CALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.CASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.CHECKCAST; -import static jdk.internal.org.objectweb.asm.Opcodes.DALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.DASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.DCONST_0; -import static jdk.internal.org.objectweb.asm.Opcodes.DRETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP2; -import static jdk.internal.org.objectweb.asm.Opcodes.FALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.FASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.FCONST_0; -import static jdk.internal.org.objectweb.asm.Opcodes.FRETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.IALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.IASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0; -import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1; -import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.LALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.LASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_0; -import static jdk.internal.org.objectweb.asm.Opcodes.LRETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.NEW; -import static jdk.internal.org.objectweb.asm.Opcodes.POP; -import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.PUTSTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.SALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.SASTORE; -import static jdk.internal.org.objectweb.asm.Opcodes.SIPUSH; -import static jdk.internal.org.objectweb.asm.Opcodes.SWAP; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJ_ANNO_PKG; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_INIT2; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_INIT3; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_SPECIALIZATION; +package org.openjdk.nashorn.internal.tools.nasgen; + +import static org.objectweb.asm.Opcodes.AALOAD; +import static org.objectweb.asm.Opcodes.AASTORE; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ANEWARRAY; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.BALOAD; +import static org.objectweb.asm.Opcodes.BASTORE; +import static org.objectweb.asm.Opcodes.BIPUSH; +import static org.objectweb.asm.Opcodes.CALOAD; +import static org.objectweb.asm.Opcodes.CASTORE; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DALOAD; +import static org.objectweb.asm.Opcodes.DASTORE; +import static org.objectweb.asm.Opcodes.DCONST_0; +import static org.objectweb.asm.Opcodes.DRETURN; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.DUP2; +import static org.objectweb.asm.Opcodes.FALOAD; +import static org.objectweb.asm.Opcodes.FASTORE; +import static org.objectweb.asm.Opcodes.FCONST_0; +import static org.objectweb.asm.Opcodes.FRETURN; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; +import static org.objectweb.asm.Opcodes.IALOAD; +import static org.objectweb.asm.Opcodes.IASTORE; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.ISTORE; +import static org.objectweb.asm.Opcodes.LALOAD; +import static org.objectweb.asm.Opcodes.LASTORE; +import static org.objectweb.asm.Opcodes.LCONST_0; +import static org.objectweb.asm.Opcodes.LRETURN; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.PUTSTATIC; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.SALOAD; +import static org.objectweb.asm.Opcodes.SASTORE; +import static org.objectweb.asm.Opcodes.SIPUSH; +import static org.objectweb.asm.Opcodes.SWAP; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJ_ANNO_PKG; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_INIT2; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_INIT3; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SPECIALIZATION_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_SPECIALIZATION; import java.util.List; -import jdk.internal.org.objectweb.asm.Handle; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; /** * Base class for all method generating classes. diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/NullVisitor.java similarity index 91% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/NullVisitor.java index 10d7f3f03..de8384a65 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/NullVisitor.java @@ -23,12 +23,12 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; /** * A visitor that does nothing on visitXXX calls. diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java similarity index 86% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java index bcd543e8a..e5b2651db 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java @@ -23,20 +23,20 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; - -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.V1_7; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPE_SUFFIX; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC; +package org.openjdk.nashorn.internal.tools.nasgen; + +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.V1_7; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROPERTYMAP_FIELD_NAME; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPE_SUFFIX; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC; import java.io.FileOutputStream; import java.io.IOException; diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java similarity index 96% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java index 85582232a..51a03025a 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java @@ -23,18 +23,18 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import jdk.internal.org.objectweb.asm.Type; -import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; +import org.objectweb.asm.Type; +import org.openjdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJ_ANNO_PKG; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.RUNTIME_PKG; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJ_ANNO_PKG; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.RUNTIME_PKG; /** * All annotation information from a class that is annotated with diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java similarity index 96% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java index a39204d3b..a168a3439 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; -import static jdk.nashorn.internal.tools.nasgen.ScriptClassInfo.SCRIPT_CLASS_ANNO_DESC; -import static jdk.nashorn.internal.tools.nasgen.ScriptClassInfo.WHERE_ENUM_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.ScriptClassInfo.SCRIPT_CLASS_ANNO_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.ScriptClassInfo.WHERE_ENUM_DESC; import java.io.BufferedInputStream; import java.io.FileInputStream; import java.io.IOException; @@ -34,14 +34,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.openjdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; /** * This class collects all @ScriptClass and other annotation information from a diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java similarity index 88% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java index 4bdb35867..93bd324ae 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java @@ -23,41 +23,41 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.DUP; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL; -import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.NEW; -import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.$CLINIT$; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; -import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.PUTFIELD; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.$CLINIT$; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.INIT; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC; +import static org.openjdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE; import java.io.BufferedInputStream; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import jdk.internal.org.objectweb.asm.AnnotationVisitor; -import jdk.internal.org.objectweb.asm.Attribute; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.FieldVisitor; -import jdk.internal.org.objectweb.asm.MethodVisitor; -import jdk.internal.org.objectweb.asm.util.CheckClassAdapter; -import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.util.CheckClassAdapter; +import org.openjdk.nashorn.internal.tools.nasgen.MemberInfo.Kind; /** * This class instruments the java class annotated with @ScriptClass. * * Changes done are: * - * 1) remove all jdk.nashorn.internal.objects.annotations.* annotations. + * 1) remove all org.openjdk.nashorn.internal.objects.annotations.* annotations. * 2) static final @Property fields stay here. Other @Property fields moved to * respective classes depending on 'where' value of annotation. * 2) add "Map" type static field named "$map". diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/StringConstants.java similarity index 98% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/StringConstants.java index 2dc560af9..81c9d7dac 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/StringConstants.java @@ -23,21 +23,21 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; import java.lang.invoke.MethodHandle; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import jdk.internal.org.objectweb.asm.Type; +import org.objectweb.asm.Type; /** * String constants used for code generation/instrumentation. */ @SuppressWarnings("javadoc") public interface StringConstants { - static final String NASHORN_INTERNAL = "jdk/nashorn/internal/"; + static final String NASHORN_INTERNAL = "org/openjdk/nashorn/internal/"; static final String OBJ_PKG = NASHORN_INTERNAL + "objects/"; static final String OBJ_ANNO_PKG = OBJ_PKG + "annotations/"; static final String RUNTIME_PKG = NASHORN_INTERNAL + "runtime/"; diff --git a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/Where.java similarity index 91% rename from make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java rename to make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/Where.java index daaa2bc34..abbb1e93c 100644 --- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Where.java +++ b/make/nashorn/buildtools/nasgen/src/org/openjdk/nashorn/internal/tools/nasgen/Where.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.nashorn.internal.tools.nasgen; +package org.openjdk.nashorn.internal.tools.nasgen; /** * Enum to tell where a Function or Property belongs. - * Note: keep this in sync. with jdk.nashorn.internal.objects.annotations.Where. + * Note: keep this in sync. with org.openjdk.nashorn.internal.objects.annotations.Where. */ public enum Where { /** this means that the item belongs in the Constructor of an object */ diff --git a/make/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java b/make/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java index c417f731d..e0e610ddd 100644 --- a/make/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java +++ b/make/nashorn/buildtools/nashorntask/src/jdk/nashorn/ant/NashornTask.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.ant; +package org.openjdk.nashorn.ant; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; diff --git a/make/nashorn/code_coverage.xml b/make/nashorn/code_coverage.xml index 7fe1f3845..6bacb3c83 100644 --- a/make/nashorn/code_coverage.xml +++ b/make/nashorn/code_coverage.xml @@ -56,7 +56,7 @@ - + diff --git a/make/nashorn/element-list b/make/nashorn/element-list index 4405748b4..2019f5d1f 100644 --- a/make/nashorn/element-list +++ b/make/nashorn/element-list @@ -261,9 +261,9 @@ module:jdk.net jdk.net jdk.nio module:jdk.rmic -module:jdk.scripting.nashorn -jdk.nashorn.api.scripting -jdk.nashorn.api.tree +module:org.openjdk.nashorn +org.openjdk.nashorn.api.scripting +org.openjdk.nashorn.api.tree module:jdk.sctp com.sun.nio.sctp module:jdk.security.auth diff --git a/make/nashorn/nashorn-core.pom b/make/nashorn/nashorn-core.pom new file mode 100644 index 000000000..d4cbc97fc --- /dev/null +++ b/make/nashorn/nashorn-core.pom @@ -0,0 +1,67 @@ + + + + + 4.0.0 + org.openjdk.nashorn + nashorn-core + OpenJDK Nashorn + NASHORN_VERSION + jar + Nashorn is an Open Source JavaScript (ECMAScript 5.1 and some 6 features) engine for the JVM. + https://github.com/openjdk/nashorn + + + + GPL v2 with the Classpath exception + https://github.com/openjdk/nashorn/blob/main/LICENSE + + + + + + org.ow2.asm + asm + ASM_VERSION + + + org.ow2.asm + asm-commons + ASM_VERSION + + + org.ow2.asm + asm-tree + ASM_VERSION + + + org.ow2.asm + asm-util + ASM_VERSION + + + diff --git a/make/nashorn/nbproject/ide-targets.xml b/make/nashorn/nbproject/ide-targets.xml index 503f89a18..767133750 100644 --- a/make/nashorn/nbproject/ide-targets.xml +++ b/make/nashorn/nbproject/ide-targets.xml @@ -30,7 +30,7 @@ - + diff --git a/make/nashorn/nbproject/project.xml b/make/nashorn/nbproject/project.xml index d97a5ecac..4f4790e18 100644 --- a/make/nashorn/nbproject/project.xml +++ b/make/nashorn/nbproject/project.xml @@ -1,25 +1,25 @@ - org.netbeans.modules.ant.freeform @@ -46,12 +46,12 @@ ../buildtools/nasgen/src - - ../src/jdk.scripting.nashorn/share/classes + + ../src/org.openjdk.nashorn/share/classes - - ../src/jdk.scripting.nashorn.shell/share/classes + + ../src/org.openjdk.nashorn.shell/share/classes @@ -66,15 +66,15 @@ UTF-8 - + java - ../src/jdk.scripting.nashorn/share/classes + ../src/org.openjdk.nashorn/share/classes UTF-8 - + java - ../src/jdk.scripting.nashorn.shell/share/classes + ../src/org.openjdk.nashorn.shell/share/classes UTF-8 @@ -156,12 +156,12 @@ ../buildtools/nasgen/src - - ../src/jdk.scripting.nashorn/share/classes + + ../src/org.openjdk.nashorn/share/classes - - ../src/jdk.scripting.nashorn.shell/share/classes + + ../src/org.openjdk.nashorn.shell/share/classes @@ -187,7 +187,7 @@ ../test/src - ../test/lib/testng.jar:../build/classes:../src/jdk.scripting.nashorn/share/classes + ../test/lib/testng.jar:../build/classes:../src/org.openjdk.nashorn/share/classes 1.8 @@ -196,11 +196,11 @@ 1.8 - ../src/jdk.scripting.nashorn/share/classes + ../src/org.openjdk.nashorn/share/classes 1.8 - ../src/jdk.scripting.nashorn.shell/share/classes + ../src/org.openjdk.nashorn.shell/share/classes 1.8 diff --git a/make/nashorn/project.properties b/make/nashorn/project.properties index 3078351b5..ba72698bf 100644 --- a/make/nashorn/project.properties +++ b/make/nashorn/project.properties @@ -25,7 +25,7 @@ application.title=nashorn # location of JDK embedded ASM sources jdk.java.base.dir=src/java.base/share/classes -jdk.asm.src.dir=${jdk.java.base.dir}/jdk/internal/org/objectweb/asm +jdk.asm.src.dir=${jdk.java.base.dir}/org/objectweb/asm # location of JDK embedded jline sources jdk.jline.src.dir=src/jdk.internal.le/share/classes @@ -45,9 +45,9 @@ javadoc.option=\ -tag "moduleGraph:a:Module Graph" # nashorn version information -nashorn.version=0.1 -nashorn.fullversion=0.1 -nashorn.product.name=Oracle Nashorn +nashorn.version=15.0 +nashorn.fullversion=15.0 +nashorn.product.name=OpenJDK Nashorn # This directory is removed when the project is cleaned: build.dir=${jdk.build.dir}/nashorn @@ -55,27 +55,34 @@ build.classes.dir=${build.dir}/classes build.zip=${build.dir}/nashorn.zip build.gzip=${build.dir}/nashorn.tar.gz -nashorn.override.option=\ - --patch-module jdk.scripting.nashorn=${build.classes.dir}/jdk.scripting.nashorn \ - --patch-module jdk.scripting.nashorn.shell=${build.classes.dir}/jdk.scripting.nashorn.shell \ - --patch-module jdk.dynalink=${build.classes.dir}/jdk.dynalink +deps.dir=${build.dir}/dependencies # project directory of ant task nashorntask.dir=${nashorn.make.dir}/buildtools/nashorntask nashorntask.dist.dir=${build.dir}/nashorntask/dist # nashorn Shell tool -nashorn.shell.tool=jdk.nashorn.tools.Shell +nashorn.shell.tool=org.openjdk.nashorn.tools.Shell # nasgen tool -nasgen.tool=jdk.nashorn.internal.tools.nasgen.Main +nasgen.tool=org.openjdk.nashorn.internal.tools.nasgen.Main nasgen.module.imports=\ - --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \ - --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED + --add-modules org.objectweb.asm \ + --add-modules org.objectweb.asm.util + +nashorn.shell.module.imports=\ + --add-exports jdk.internal.ed/jdk.internal.editor.spi=org.openjdk.nashorn.shell \ + --add-exports jdk.internal.ed/jdk.internal.editor.external=org.openjdk.nashorn.shell \ + --add-exports jdk.internal.le/jdk.internal.org.jline.reader=org.openjdk.nashorn.shell \ + --add-exports jdk.internal.le/jdk.internal.org.jline.reader.impl=org.openjdk.nashorn.shell \ + --add-exports jdk.internal.le/jdk.internal.org.jline.reader.impl.completer=org.openjdk.nashorn.shell \ + --add-exports jdk.internal.le/jdk.internal.org.jline.keymap=org.openjdk.nashorn.shell \ + --add-exports jdk.internal.le/jdk.internal.org.jline.terminal=org.openjdk.nashorn.shell \ + --add-reads org.openjdk.nashorn.shell=jdk.internal.ed # parallel test runner tool -parallel.test.runner=jdk.nashorn.internal.test.framework.ParallelTestRunner +parallel.test.runner=org.openjdk.nashorn.internal.test.framework.ParallelTestRunner # test classes directory build.test.classes.dir=${build.dir}/test/classes @@ -91,12 +98,10 @@ build.nooptimistic.test.results.dir=${build.dir}/test/nooptimistic/reports # This directory is removed when the project is cleaned: dist.dir=build/nashorn/dist -dynalink.jar=${dist.dir}/dynalink.jar nashorn.jar=${dist.dir}/nashorn.jar jjs.jar=${dist.dir}/jjs.jar dist.javadoc.dir=${dist.dir}/javadoc dist.nashornapi.javadoc.dir=${dist.javadoc.dir}/nashornapi -dist.dynalinkapi.javadoc.dir=${dist.javadoc.dir}/dynalinkapi # configuration for flight recorder run.test.jvmargs.jfr=XX:StartFlightRecording=disk=true,dumponexit=true,dumponexitpath=${build.dir},stackdepth=128 @@ -136,7 +141,7 @@ testng.listeners=\ org.testng.reporters.FailedReporter, \ org.testng.reporters.XMLReporter \ org.testng.reporters.EmailableReporter, \ - jdk.nashorn.internal.test.framework.JSJUnitReportReporter + org.openjdk.nashorn.internal.test.framework.JSJUnitReportReporter javac.debug=true javac.encoding=ascii @@ -148,24 +153,23 @@ javac.test.classpath=\ ${file.reference.snakeyaml.jar} test.module.imports.compile.time=\ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.ir=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.codegen=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.parser=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.objects=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.doubleconv=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.linker=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.events=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.regexp=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.regexp.joni=ALL-UNNAMED \ - --add-exports jdk.scripting.nashorn/jdk.nashorn.tools=ALL-UNNAMED \ - --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.ir=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.codegen=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.parser=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.objects=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.doubleconv=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.linker=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.events=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.options=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.regexp=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.regexp.joni=ALL-UNNAMED \ + --add-exports org.openjdk.nashorn/org.openjdk.nashorn.tools=ALL-UNNAMED test.module.imports.runtime=\ ${test.module.imports.compile.time} \ - --add-opens jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED \ - --add-opens jdk.scripting.nashorn/jdk.nashorn.internal.runtime.doubleconv=ALL-UNNAMED + --add-opens org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime=ALL-UNNAMED \ + --add-opens org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.doubleconv=ALL-UNNAMED meta.inf.dir=${nashorn.module.src.dir}/META-INF @@ -267,7 +271,7 @@ test262-test-sys-prop.test.js.enable.strict.mode=true test262-test-sys-prop.test.js.exclude.list=\ ${test262.suite.dir}/ch07/7.4/S7.4_A6.js \ ${test262.suite.dir}/ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js \ - ${test262.suite.dir}/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js + ${test262.suite.dir}/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js # list of test262 test dirs to be excluded test262-test-sys-prop.test.js.exclude.dir=\ @@ -333,15 +337,12 @@ run.test.classpath=\ ${nashorn.internal.tests.jar}${path.separator}\ ${nashorn.api.tests.jar} -dynalink.module.src.dir=src/jdk.dynalink/share/classes -dynalink.module.classes.dir=${build.classes.dir}/jdk.dynalink -nashorn.module.src.dir=src/jdk.scripting.nashorn/share/classes -nashorn.module.classes.dir=${build.classes.dir}/jdk.scripting.nashorn -nashorn.shell.module.src.dir=src/jdk.scripting.nashorn.shell/share/classes -nashorn.shell.module.classes.dir=${build.classes.dir}/jdk.scripting.nashorn.shell +nashorn.module.src.dir=src/org.openjdk.nashorn/share/classes +nashorn.module.classes.dir=${build.classes.dir}/org.openjdk.nashorn +nashorn.shell.module.src.dir=src/org.openjdk.nashorn.shell/share/classes +nashorn.shell.module.classes.dir=${build.classes.dir}/org.openjdk.nashorn.shell -src.dir=${dynalink.module.src.dir}${path.separator}\ - ${nashorn.module.src.dir}${path.separator}\ +src.dir=${nashorn.module.src.dir}${path.separator}\ ${nashorn.shell.module.src.dir}${path.separator}\ ${jdk.jline.src.dir} @@ -365,13 +366,14 @@ run.test.jvmargs.common=\ -server \ ${test.module.imports.runtime} \ ${run.test.jvmargs.external} \ - --add-modules jdk.scripting.nashorn.shell \ - ${nashorn.override.option} \ + --module-path ${deps.dir}:${dist.dir} \ + --add-modules org.openjdk.nashorn \ + --add-modules org.openjdk.nashorn.shell \ + ${nashorn.shell.module.imports} \ -Dfile.encoding=UTF-8 \ -Duser.language=${run.test.user.language} \ -Duser.country=${run.test.user.country} \ -Dnashorn.typeInfo.cacheDir=${build.dir}${file.separator}test${file.separator}type_info_cache \ - -Dnashorn.args.prepend=--no-deprecation-warning \ ${jfr.args} \ -XX:+HeapDumpOnOutOfMemoryError diff --git a/src/jdk.scripting.nashorn.shell/share/classes/module-info.java b/src/org.openjdk.nashorn.shell/share/classes/module-info.java similarity index 89% rename from src/jdk.scripting.nashorn.shell/share/classes/module-info.java rename to src/org.openjdk.nashorn.shell/share/classes/module-info.java index 5bc8b0b71..2de2d66ef 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/module-info.java +++ b/src/org.openjdk.nashorn.shell/share/classes/module-info.java @@ -34,12 +34,9 @@ * @moduleGraph * @since 9 */ -@Deprecated(since="11", forRemoval=true) -module jdk.scripting.nashorn.shell { +module org.openjdk.nashorn.shell { requires static java.compiler; requires jdk.internal.le; - requires jdk.scripting.nashorn; + requires org.openjdk.nashorn; requires jdk.internal.ed; - uses jdk.internal.editor.spi.BuildInEditorProvider; } - diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Console.java similarity index 99% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Console.java index 3a67c554a..cb43e3a2c 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Console.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.File; import java.io.IOException; diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/EditObject.java similarity index 95% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/EditObject.java index 18640879c..80e83f32d 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/EditObject.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; import java.util.ServiceLoader; -import jdk.nashorn.api.scripting.AbstractJSObject; +import org.openjdk.nashorn.api.scripting.AbstractJSObject; import jdk.internal.editor.spi.BuildInEditorProvider; -import jdk.nashorn.internal.runtime.JSType; -import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; +import org.openjdk.nashorn.internal.runtime.JSType; +import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; /* * "edit" top level script function which shows an external Window diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/ExternalEditor.java similarity index 99% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/ExternalEditor.java index c046a350a..baae4165b 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/ExternalEditor.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/ExternalEditor.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.IOException; import java.nio.charset.Charset; diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/HistoryObject.java similarity index 94% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/HistoryObject.java index 149e5883b..fc9d6ca03 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/HistoryObject.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/HistoryObject.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.BufferedReader; import java.io.File; @@ -39,11 +39,11 @@ import java.util.function.Supplier; import jdk.internal.org.jline.reader.History; -import jdk.nashorn.api.scripting.AbstractJSObject; -import jdk.nashorn.api.scripting.JSObject; -import jdk.nashorn.internal.runtime.JSType; -import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; -import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; +import org.openjdk.nashorn.api.scripting.AbstractJSObject; +import org.openjdk.nashorn.api.scripting.JSObject; +import org.openjdk.nashorn.internal.runtime.JSType; +import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError; +import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; /* * A script friendly object that exposes history of commands to scripts. diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/JavacPackagesHelper.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/JavacPackagesHelper.java similarity index 98% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/JavacPackagesHelper.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/JavacPackagesHelper.java index d5a22dffe..171744359 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/JavacPackagesHelper.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/JavacPackagesHelper.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.IOException; import java.io.File; @@ -40,7 +40,7 @@ import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; import javax.tools.ToolProvider; -import jdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.Context; /** * A javac package helper that uses javac to complete package names. diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/JrtPackagesHelper.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/JrtPackagesHelper.java similarity index 97% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/JrtPackagesHelper.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/JrtPackagesHelper.java index 4a7e3fd2e..8067b9e54 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/JrtPackagesHelper.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/JrtPackagesHelper.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.IOException; import java.net.URI; @@ -34,7 +34,7 @@ import java.nio.file.Path; import java.util.HashSet; import java.util.Set; -import jdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.Context; /** * A java packages helper that uses jrt file system. diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Main.java similarity index 94% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Main.java index 36abf212d..e32c04c12 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Main.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; -import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; +import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import java.io.File; import java.io.InputStream; @@ -39,23 +39,22 @@ import java.util.function.Consumer; import jdk.internal.org.jline.reader.UserInterruptException; -import jdk.nashorn.internal.objects.Global; -import jdk.nashorn.internal.objects.NativeJava; -import jdk.nashorn.internal.runtime.Context; -import jdk.nashorn.internal.runtime.NativeJavaPackage; -import jdk.nashorn.internal.runtime.Property; -import jdk.nashorn.internal.runtime.ScriptEnvironment; -import jdk.nashorn.internal.runtime.ScriptFunction; -import jdk.nashorn.internal.runtime.ScriptingFunctions; -import jdk.nashorn.internal.runtime.ScriptObject; -import jdk.nashorn.internal.runtime.ScriptRuntime; -import jdk.nashorn.internal.runtime.Source; -import jdk.nashorn.tools.Shell; +import org.openjdk.nashorn.internal.objects.Global; +import org.openjdk.nashorn.internal.objects.NativeJava; +import org.openjdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.NativeJavaPackage; +import org.openjdk.nashorn.internal.runtime.Property; +import org.openjdk.nashorn.internal.runtime.ScriptEnvironment; +import org.openjdk.nashorn.internal.runtime.ScriptFunction; +import org.openjdk.nashorn.internal.runtime.ScriptingFunctions; +import org.openjdk.nashorn.internal.runtime.ScriptObject; +import org.openjdk.nashorn.internal.runtime.ScriptRuntime; +import org.openjdk.nashorn.internal.runtime.Source; +import org.openjdk.nashorn.tools.Shell; /** * Interactive command line Shell for Nashorn. */ -@Deprecated(since="11", forRemoval=true) public final class Main extends Shell { private Main() {} diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/NashornCompleter.java similarity index 92% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/NashornCompleter.java index 7f0db6633..ea87fe0fd 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/NashornCompleter.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/NashornCompleter.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.File; import java.io.PrintWriter; @@ -37,31 +37,31 @@ import jdk.internal.org.jline.reader.LineReader; import jdk.internal.org.jline.reader.ParsedLine; import jdk.internal.org.jline.reader.UserInterruptException; -import jdk.nashorn.api.tree.AssignmentTree; -import jdk.nashorn.api.tree.BinaryTree; -import jdk.nashorn.api.tree.CompilationUnitTree; -import jdk.nashorn.api.tree.CompoundAssignmentTree; -import jdk.nashorn.api.tree.ConditionalExpressionTree; -import jdk.nashorn.api.tree.ExpressionTree; -import jdk.nashorn.api.tree.ExpressionStatementTree; -import jdk.nashorn.api.tree.FunctionCallTree; -import jdk.nashorn.api.tree.IdentifierTree; -import jdk.nashorn.api.tree.InstanceOfTree; -import jdk.nashorn.api.tree.MemberSelectTree; -import jdk.nashorn.api.tree.NewTree; -import jdk.nashorn.api.tree.SimpleTreeVisitorES5_1; -import jdk.nashorn.api.tree.Tree; -import jdk.nashorn.api.tree.UnaryTree; -import jdk.nashorn.api.tree.Parser; -import jdk.nashorn.api.scripting.NashornException; -import jdk.nashorn.tools.PartialParser; -import jdk.nashorn.internal.objects.NativeSyntaxError; -import jdk.nashorn.internal.objects.Global; -import jdk.nashorn.internal.runtime.ECMAException; -import jdk.nashorn.internal.runtime.Context; -import jdk.nashorn.internal.runtime.ScriptEnvironment; -import jdk.nashorn.internal.runtime.ScriptFunction; -import jdk.nashorn.internal.runtime.ScriptRuntime; +import org.openjdk.nashorn.api.tree.AssignmentTree; +import org.openjdk.nashorn.api.tree.BinaryTree; +import org.openjdk.nashorn.api.tree.CompilationUnitTree; +import org.openjdk.nashorn.api.tree.CompoundAssignmentTree; +import org.openjdk.nashorn.api.tree.ConditionalExpressionTree; +import org.openjdk.nashorn.api.tree.ExpressionTree; +import org.openjdk.nashorn.api.tree.ExpressionStatementTree; +import org.openjdk.nashorn.api.tree.FunctionCallTree; +import org.openjdk.nashorn.api.tree.IdentifierTree; +import org.openjdk.nashorn.api.tree.InstanceOfTree; +import org.openjdk.nashorn.api.tree.MemberSelectTree; +import org.openjdk.nashorn.api.tree.NewTree; +import org.openjdk.nashorn.api.tree.SimpleTreeVisitorES5_1; +import org.openjdk.nashorn.api.tree.Tree; +import org.openjdk.nashorn.api.tree.UnaryTree; +import org.openjdk.nashorn.api.tree.Parser; +import org.openjdk.nashorn.api.scripting.NashornException; +import org.openjdk.nashorn.tools.PartialParser; +import org.openjdk.nashorn.internal.objects.NativeSyntaxError; +import org.openjdk.nashorn.internal.objects.Global; +import org.openjdk.nashorn.internal.runtime.ECMAException; +import org.openjdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.ScriptEnvironment; +import org.openjdk.nashorn.internal.runtime.ScriptFunction; +import org.openjdk.nashorn.internal.runtime.ScriptRuntime; /** * A simple source completer for nashorn. Handles code completion for diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PackagesHelper.java similarity index 98% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PackagesHelper.java index f14e97db1..5601b36b8 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PackagesHelper.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.lang.reflect.Modifier; import java.io.IOException; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import jdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.Context; /** * Abstract helper class to compute properties of a Java package object. Properties of diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PropertiesHelper.java similarity index 94% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PropertiesHelper.java index bc95844bb..f95b6ee8b 100644 --- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java +++ b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PropertiesHelper.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.tools.jjs; +package org.openjdk.nashorn.tools.jjs; import java.io.IOException; import java.util.ArrayList; @@ -33,13 +33,13 @@ import java.util.WeakHashMap; import java.util.regex.Pattern; import java.util.stream.Collectors; -import jdk.nashorn.internal.runtime.Context; -import jdk.nashorn.internal.runtime.JSType; -import jdk.nashorn.internal.runtime.NativeJavaPackage; -import jdk.nashorn.internal.runtime.PropertyMap; -import jdk.nashorn.internal.runtime.ScriptObject; -import jdk.nashorn.internal.runtime.ScriptRuntime; -import jdk.nashorn.internal.objects.NativeJava; +import org.openjdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.JSType; +import org.openjdk.nashorn.internal.runtime.NativeJavaPackage; +import org.openjdk.nashorn.internal.runtime.PropertyMap; +import org.openjdk.nashorn.internal.runtime.ScriptObject; +import org.openjdk.nashorn.internal.runtime.ScriptRuntime; +import org.openjdk.nashorn.internal.objects.NativeJava; /* * A helper class to get properties of a given object for source code completion. diff --git a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/resources/jjs.js b/src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/resources/jjs.js similarity index 100% rename from src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/resources/jjs.js rename to src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/resources/jjs.js diff --git a/src/jdk.scripting.nashorn.shell/share/man/jjs.1 b/src/org.openjdk.nashorn.shell/share/man/jjs.1 similarity index 98% rename from src/jdk.scripting.nashorn.shell/share/man/jjs.1 rename to src/org.openjdk.nashorn.shell/share/man/jjs.1 index ffeefcd52..ff9bb5efc 100644 --- a/src/jdk.scripting.nashorn.shell/share/man/jjs.1 +++ b/src/org.openjdk.nashorn.shell/share/man/jjs.1 @@ -139,7 +139,7 @@ specifying the JavaFX modules in the \f[CB]jjs\f[R] command: .IP .nf \f[CB] -jlink\ \-\-module\-path\ /SOMEDIR/javafx\-jmods\-11\ \-\-add\-modules\ jdk.scripting.nashorn,jdk.scripting.nashorn.shell,javafx.controls\ \-\-output\ /SOMEDIR/myjdk +jlink\ \-\-module\-path\ /SOMEDIR/javafx\-jmods\-11\ \-\-add\-modules\ org.openjdk.nashorn,org.openjdk.nashorn.shell,javafx.controls\ \-\-output\ /SOMEDIR/myjdk /SOMEDIR/myjdk/bin/jjs\ \-fx\ HelloWorld.js \f[R] diff --git a/src/jdk.scripting.nashorn/share/classes/module-info.java b/src/org.openjdk.nashorn/share/classes/module-info.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/module-info.java rename to src/org.openjdk.nashorn/share/classes/module-info.java index 6b9b1365d..e4ab72947 100644 --- a/src/jdk.scripting.nashorn/share/classes/module-info.java +++ b/src/org.openjdk.nashorn/share/classes/module-info.java @@ -44,7 +44,7 @@ * * and then use it just as you would any other JSR-223 script engine. See - * {@link jdk.nashorn.api.scripting} package for details. + * {@link org.openjdk.nashorn.api.scripting} package for details. *

Compatibility

* Nashorn is 100% compliant with the * Nashorn script engines implement the optional {@link javax.script.Invocable} and {@link javax.script.Compilable} * interfaces, allowing for efficient pre-compilation and repeated execution of scripts. In addition, * this package provides nashorn specific extension classes, interfaces and methods. See - * {@link jdk.nashorn.api.scripting.NashornScriptEngineFactory} for further details. + * {@link org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory} for further details. * * @since 1.8u40 */ -package jdk.nashorn.api.scripting; +package org.openjdk.nashorn.api.scripting; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/scripting/resources/Messages.properties similarity index 100% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/scripting/resources/Messages.properties diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayAccessTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayAccessTree.java index d1554ebc2..efb697947 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayAccessTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an array access expression. @@ -33,12 +33,8 @@ * expression [ index ] * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ArrayAccessTree extends ExpressionTree { /** * Returns the array that is accessed. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayAccessTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayAccessTreeImpl.java index 820c1fb39..815e7e4de 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayAccessTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.Expression; +import org.openjdk.nashorn.internal.ir.Expression; final class ArrayAccessTreeImpl extends ExpressionTreeImpl implements ArrayAccessTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayLiteralTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayLiteralTree.java index 048f48daf..f8a8559c7 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayLiteralTree.java @@ -23,19 +23,15 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * Represents ECMAScript array literal expression. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ArrayLiteralTree extends ExpressionTree { /** * Returns the list of Array element expressions. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayLiteralTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayLiteralTreeImpl.java index e69032450..5e8025317 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ArrayLiteralTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.LiteralNode; +import org.openjdk.nashorn.internal.ir.LiteralNode; final class ArrayLiteralTreeImpl extends ExpressionTreeImpl implements ArrayLiteralTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/AssignmentTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/AssignmentTree.java index c87eabbae..5c4d9865b 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/AssignmentTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an assignment expression. @@ -33,12 +33,8 @@ * variable = expression * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface AssignmentTree extends ExpressionTree { /** * Returns the left hand side (LHS) of this assignment. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/AssignmentTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/AssignmentTreeImpl.java index 94ef39962..2c852c39d 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/AssignmentTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.BinaryNode; +import org.openjdk.nashorn.internal.ir.BinaryNode; final class AssignmentTreeImpl extends ExpressionTreeImpl implements AssignmentTree { private final Tree.Kind kind; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BinaryTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BinaryTree.java index 61fcfa775..989fb08ed 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BinaryTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a binary expression. @@ -34,12 +34,8 @@ * leftOperand operator rightOperand * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface BinaryTree extends ExpressionTree { /** * Returns left hand side (LHS) of this binary expression. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BinaryTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BinaryTreeImpl.java index cad9db2ac..c2c159965 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BinaryTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.BinaryNode; +import org.openjdk.nashorn.internal.ir.BinaryNode; class BinaryTreeImpl extends ExpressionTreeImpl implements BinaryTree { private final Tree.Kind kind; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BlockTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BlockTree.java index aa04fad06..0c6dad8a4 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BlockTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -37,12 +37,8 @@ * { statements } * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface BlockTree extends StatementTree { /** * Returns the list of statements in this block. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BlockTreeImpl.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BlockTreeImpl.java index c74a0eaa0..8fbd9e58e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BlockTreeImpl.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.Block; -import jdk.nashorn.internal.ir.BlockStatement; +import org.openjdk.nashorn.internal.ir.Block; +import org.openjdk.nashorn.internal.ir.BlockStatement; final class BlockTreeImpl extends StatementTreeImpl implements BlockTree { private final List statements; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BreakTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BreakTree.java index 5e797539c..1d0c6a7d2 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BreakTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'break' statement. @@ -35,12 +35,8 @@ * break label ; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface BreakTree extends GotoTree { /** * Label associated with this break statement. This is null diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BreakTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BreakTreeImpl.java index b2b5ce4cc..0281e3641 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/BreakTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.BreakNode; +import org.openjdk.nashorn.internal.ir.BreakNode; final class BreakTreeImpl extends StatementTreeImpl implements BreakTree { private final String label; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CaseTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CaseTree.java index d5d4524d5..54552b87c 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CaseTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -39,12 +39,8 @@ * statements * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface CaseTree extends Tree { /** * Case expression of this 'case' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CaseTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CaseTreeImpl.java index 4f12f413e..128e76bf3 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CaseTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.CaseNode; +import org.openjdk.nashorn.internal.ir.CaseNode; final class CaseTreeImpl extends TreeImpl implements CaseTree { private final ExpressionTree expression; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CatchTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CatchTree.java index a3ed5bd25..dbdb3a2b2 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CatchTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'catch' block in a 'try' statement. @@ -34,12 +34,8 @@ * block * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface CatchTree extends Tree { /** * Returns the catch parameter identifier or parameter binding pattern of the exception caught. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CatchTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CatchTreeImpl.java index f392d59ad..2cde09e24 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CatchTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.CatchNode; +import org.openjdk.nashorn.internal.ir.CatchNode; final class CatchTreeImpl extends TreeImpl implements CatchTree { private final ExpressionTree param; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassDeclarationTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassDeclarationTree.java index cf2571f2b..31c3729b8 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassDeclarationTree.java @@ -22,19 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * A tree node that represents a class declaration. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ClassDeclarationTree extends StatementTree { /** diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassDeclarationTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassDeclarationTreeImpl.java index 824f67748..fcddbed0e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassDeclarationTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassDeclarationTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.VarNode; +import org.openjdk.nashorn.internal.ir.VarNode; final class ClassDeclarationTreeImpl extends StatementTreeImpl implements ClassDeclarationTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassExpressionTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassExpressionTree.java index ec693d45b..1a12c5e7d 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassExpressionTree.java @@ -23,19 +23,15 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * A tree node that represents a class expression. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ClassExpressionTree extends ExpressionTree { /** * Class identifier. Optional. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassExpressionTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassExpressionTreeImpl.java index c4108c969..153509141 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ClassExpressionTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ClassExpressionTreeImpl.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.ClassNode; +import org.openjdk.nashorn.internal.ir.ClassNode; final class ClassExpressionTreeImpl extends ExpressionTreeImpl implements ClassExpressionTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompilationUnitTree.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompilationUnitTree.java index fb424b767..659d89b8d 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompilationUnitTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -31,12 +31,8 @@ * Represents the abstract syntax tree for compilation units (source * files) * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface CompilationUnitTree extends Tree { /** * Return the list of source elements in this compilation unit. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompilationUnitTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompilationUnitTreeImpl.java index 552a4c581..243a28899 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompilationUnitTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.FunctionNode; final class CompilationUnitTreeImpl extends TreeImpl implements CompilationUnitTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompoundAssignmentTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompoundAssignmentTree.java index 53d70be40..d807e5d10 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompoundAssignmentTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for compound assignment operator. @@ -34,12 +34,8 @@ * variable operator expression * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface CompoundAssignmentTree extends ExpressionTree { /** * Returns the left hand side (LHS) of this assignment. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java index 3916377de..4a34a7672 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.BinaryNode; +import org.openjdk.nashorn.internal.ir.BinaryNode; final class CompoundAssignmentTreeImpl extends ExpressionTreeImpl implements CompoundAssignmentTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalExpressionTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalExpressionTree.java index 5f90b61b4..20bba3447 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalExpressionTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for the conditional operator ? :. @@ -33,12 +33,8 @@ * condition ? trueExpression : falseExpression * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ConditionalExpressionTree extends ExpressionTree { /** * Returns the condition expression of this ternary expression. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java index 152c61086..a96ffa4b1 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.TernaryNode; +import org.openjdk.nashorn.internal.ir.TernaryNode; final class ConditionalExpressionTreeImpl extends ExpressionTreeImpl implements ConditionalExpressionTree { private final ExpressionTree condExpr, trueExpr, falseExpr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalLoopTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalLoopTree.java index ef5ac5593..e3f476123 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalLoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ConditionalLoopTree.java @@ -23,17 +23,13 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A mixin for conditional "loop" statements. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ConditionalLoopTree extends LoopTree { /** * Returns the condition expression of this 'loop' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ContinueTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ContinueTree.java index 28b4f9f84..f811b4a65 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ContinueTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'continue' statement. @@ -34,12 +34,8 @@ * continue label ; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ContinueTree extends GotoTree { /** * Label associated with this continue statement. This is null diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ContinueTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ContinueTreeImpl.java index b974cb735..152c07811 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ContinueTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ContinueNode; +import org.openjdk.nashorn.internal.ir.ContinueNode; final class ContinueTreeImpl extends StatementTreeImpl implements ContinueTree { private final String label; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DebuggerTree.java similarity index 86% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DebuggerTree.java index 052b0b7d6..5ec7505ff 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DebuggerTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'debugger' statement. @@ -33,11 +33,7 @@ * debugger; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface DebuggerTree extends StatementTree { } diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DebuggerTreeImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DebuggerTreeImpl.java index 45eda3ed1..7a73b4468 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DebuggerTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.DebuggerNode; +import org.openjdk.nashorn.internal.ir.DebuggerNode; final class DebuggerTreeImpl extends StatementTreeImpl implements DebuggerTree { DebuggerTreeImpl(final DebuggerNode node) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DestructuringDeclTreeImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DestructuringDeclTreeImpl.java index c69630196..0b7f2e15c 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DestructuringDeclTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DestructuringDeclTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ExpressionStatement; -import jdk.nashorn.internal.parser.TokenType; +import org.openjdk.nashorn.internal.ir.ExpressionStatement; +import org.openjdk.nashorn.internal.parser.TokenType; // This implementation of VariableTree represents a destructuring declaration final class DestructuringDeclTreeImpl extends StatementTreeImpl diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Diagnostic.java similarity index 92% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Diagnostic.java index 0528c333a..05cfb0f55 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Diagnostic.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Diagnostic.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * Interface for diagnostics from tools. A diagnostic usually reports @@ -40,12 +40,8 @@ *

Line terminator is as defined in ECMAScript specification which is one * of { \u000A, \u000B, \u2028, \u2029 }. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface Diagnostic { /** @@ -59,11 +55,7 @@ public interface Diagnostic { * should imply any inherent semantic meaning to the message * of the diagnostic: for example, a tool might provide an * option to report all warnings as errors. - * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. */ - @Deprecated(since="11", forRemoval=true) enum Kind { /** * Problem which prevents the tool's normal completion. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DiagnosticImpl.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DiagnosticImpl.java index ee4eadf7f..56049b6bb 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DiagnosticImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.parser.Token; -import jdk.nashorn.internal.runtime.ParserException; +import org.openjdk.nashorn.internal.parser.Token; +import org.openjdk.nashorn.internal.runtime.ParserException; final class DiagnosticImpl implements Diagnostic { private final ParserException exp; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DiagnosticListener.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DiagnosticListener.java index 8c3d3bbff..cbcaff949 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DiagnosticListener.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DiagnosticListener.java @@ -23,17 +23,13 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * Interface for receiving diagnostics from Nashorn parser. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) @FunctionalInterface public interface DiagnosticListener { /** diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DoWhileLoopTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DoWhileLoopTree.java index 96d08644e..e84704a8a 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DoWhileLoopTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'do' statement. @@ -35,12 +35,8 @@ * while ( expression ); * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface DoWhileLoopTree extends ConditionalLoopTree { /** * Returns the condition expression of this do-while statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DoWhileLoopTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DoWhileLoopTreeImpl.java index a86ca9d52..882545a61 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/DoWhileLoopTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.WhileNode; +import org.openjdk.nashorn.internal.ir.WhileNode; final class DoWhileLoopTreeImpl extends StatementTreeImpl implements DoWhileLoopTree { private final ExpressionTree cond; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/EmptyStatementTree.java similarity index 86% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/EmptyStatementTree.java index 6de96b555..c0ed6c2cc 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/EmptyStatementTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an empty (skip) statement. @@ -33,10 +33,6 @@ * ; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface EmptyStatementTree extends StatementTree {} diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/EmptyStatementTreeImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/EmptyStatementTreeImpl.java index c5d689dc9..fdac25776 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/EmptyStatementTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.EmptyNode; +import org.openjdk.nashorn.internal.ir.EmptyNode; final class EmptyStatementTreeImpl extends StatementTreeImpl implements EmptyStatementTree { EmptyStatementTreeImpl(final EmptyNode node) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ErroneousTree.java similarity index 85% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ErroneousTree.java index 79b9c6c31..954bac71f 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ErroneousTree.java @@ -23,16 +23,12 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node to stand in for a malformed expression. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ErroneousTree extends ExpressionTree { } diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ErroneousTreeImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ErroneousTreeImpl.java index bee4feeab..fdfcebff8 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ErroneousTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ErrorNode; +import org.openjdk.nashorn.internal.ir.ErrorNode; final class ErroneousTreeImpl extends ExpressionTreeImpl implements ErroneousTree { ErroneousTreeImpl(final ErrorNode errorNode) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTree.java index d6c96c1d5..b84ddd26d 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTree.java @@ -22,17 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * A Tree node for export entry in Module information. - * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. */ -@Deprecated(since="11", forRemoval=true) public interface ExportEntryTree extends Tree { /** * Returns the entry's export name. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTreeImpl.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTreeImpl.java index 04d2ead57..641126c6a 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExportEntryTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTreeImpl.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; import java.util.stream.Collectors; -import jdk.nashorn.internal.ir.FunctionNode; -import jdk.nashorn.internal.ir.IdentNode; -import jdk.nashorn.internal.ir.Module; -import static jdk.nashorn.api.tree.ModuleTreeImpl.identOrNull; +import org.openjdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.IdentNode; +import org.openjdk.nashorn.internal.ir.Module; +import static org.openjdk.nashorn.api.tree.ModuleTreeImpl.identOrNull; final class ExportEntryTreeImpl extends TreeImpl implements ExportEntryTree { private final long startPos, endPos; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionStatementTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionStatementTree.java index d7bbd28ab..ae23286d2 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionStatementTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an expression statement. @@ -33,12 +33,8 @@ * expression ; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ExpressionStatementTree extends StatementTree { /** * Returns the expression of this expression statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionStatementTreeImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionStatementTreeImpl.java index a3a602f3e..c8275e4c3 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionStatementTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ExpressionStatement; +import org.openjdk.nashorn.internal.ir.ExpressionStatement; final class ExpressionStatementTreeImpl extends StatementTreeImpl implements ExpressionStatementTree { private final ExpressionTree expr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionTree.java similarity index 86% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionTree.java index 69752f1d1..ed1b74ee2 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionTree.java @@ -23,16 +23,12 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node used as the base class for the different types of * expressions. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ExpressionTree extends Tree {} diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionTreeImpl.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionTreeImpl.java index 3024f51ea..e6f3156fa 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExpressionTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.Expression; +import org.openjdk.nashorn.internal.ir.Expression; abstract class ExpressionTreeImpl extends TreeImpl implements ExpressionTree { ExpressionTreeImpl(final Expression expr) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForInLoopTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForInLoopTree.java index c34c64fcc..12488dd87 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForInLoopTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for for..in statement @@ -34,12 +34,8 @@ * statement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ForInLoopTree extends LoopTree { /** * The for..in left hand side expression. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForInLoopTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForInLoopTreeImpl.java index 3ba38eb75..f43598964 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForInLoopTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ForNode; +import org.openjdk.nashorn.internal.ir.ForNode; final class ForInLoopTreeImpl extends StatementTreeImpl implements ForInLoopTree { private final ExpressionTree lhsExpr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForLoopTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForLoopTree.java index d9466463f..78b8bc3d0 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForLoopTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a basic 'for' loop statement. @@ -34,12 +34,8 @@ * statement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ForLoopTree extends ConditionalLoopTree { /** * Returns the initializer expression of this 'for' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForLoopTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForLoopTreeImpl.java index 4cedbe19e..1f9758e1b 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForLoopTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ForNode; +import org.openjdk.nashorn.internal.ir.ForNode; final class ForLoopTreeImpl extends StatementTreeImpl implements ForLoopTree { private final ExpressionTree init; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForOfLoopTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForOfLoopTree.java index b6dd42417..3f00fc1db 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForOfLoopTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for for..of statement. @@ -34,12 +34,8 @@ * statement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ForOfLoopTree extends LoopTree { /** * The for..of left hand side expression. @@ -63,4 +59,3 @@ public interface ForOfLoopTree extends LoopTree { @Override StatementTree getStatement(); } - diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForOfLoopTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForOfLoopTreeImpl.java index e2306e51c..64b6e26d8 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForOfLoopTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ForOfLoopTreeImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ForNode; +import org.openjdk.nashorn.internal.ir.ForNode; final class ForOfLoopTreeImpl extends StatementTreeImpl implements ForOfLoopTree { private final ExpressionTree lhsExpr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionCallTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionCallTree.java index 713a21fd4..5554c0b79 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionCallTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -37,12 +37,8 @@ * this . identifier ( arguments ) * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface FunctionCallTree extends ExpressionTree { /** * Returns the function being called. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionCallTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionCallTreeImpl.java index aaeb930d1..717625313 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionCallTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.CallNode; +import org.openjdk.nashorn.internal.ir.CallNode; class FunctionCallTreeImpl extends ExpressionTreeImpl implements FunctionCallTree { private final List arguments; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionDeclarationTree.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionDeclarationTree.java index 19442de1f..7c1dbe2c5 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionDeclarationTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -43,12 +43,8 @@ * body * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface FunctionDeclarationTree extends StatementTree { /** * Returns the name of the function being declared. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java index 592e4dce9..d74ca9f03 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.FunctionNode; -import jdk.nashorn.internal.ir.VarNode; +import org.openjdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.VarNode; final class FunctionDeclarationTreeImpl extends StatementTreeImpl implements FunctionDeclarationTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionExpressionTree.java similarity index 92% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionExpressionTree.java index 07e931f05..fc7725c85 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionExpressionTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -41,12 +41,8 @@ * var func = (x) => x+1 * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface FunctionExpressionTree extends ExpressionTree { /** * Returns the name of the function being declared. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionExpressionTreeImpl.java similarity index 97% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionExpressionTreeImpl.java index 57b060b64..1d667c9df 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/FunctionExpressionTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.FunctionNode; final class FunctionExpressionTreeImpl extends ExpressionTreeImpl implements FunctionExpressionTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/GotoTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/GotoTree.java index c23ede97a..d1a98703f 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/GotoTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/GotoTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a statement that jumps to a target. Note that @@ -31,12 +31,8 @@ * type serves as a super interface for {@link BreakTree} and * {@link ContinueTree}. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface GotoTree extends StatementTree { /** * Label associated with this goto statement. This is null diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IRTranslator.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IRTranslator.java index 55bedf37b..93e73e177 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IRTranslator.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IRTranslator.java @@ -22,53 +22,53 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map; -import jdk.nashorn.internal.ir.AccessNode; -import jdk.nashorn.internal.ir.BinaryNode; -import jdk.nashorn.internal.ir.Block; -import jdk.nashorn.internal.ir.BlockStatement; -import jdk.nashorn.internal.ir.BreakNode; -import jdk.nashorn.internal.ir.CallNode; -import jdk.nashorn.internal.ir.CaseNode; -import jdk.nashorn.internal.ir.CatchNode; -import jdk.nashorn.internal.ir.ClassNode; -import jdk.nashorn.internal.ir.ContinueNode; -import jdk.nashorn.internal.ir.DebuggerNode; -import jdk.nashorn.internal.ir.EmptyNode; -import jdk.nashorn.internal.ir.ErrorNode; -import jdk.nashorn.internal.ir.Expression; -import jdk.nashorn.internal.ir.ExpressionStatement; -import jdk.nashorn.internal.ir.ForNode; -import jdk.nashorn.internal.ir.FunctionNode; -import jdk.nashorn.internal.ir.IdentNode; -import jdk.nashorn.internal.ir.IfNode; -import jdk.nashorn.internal.ir.IndexNode; -import jdk.nashorn.internal.ir.LabelNode; -import jdk.nashorn.internal.ir.LiteralNode; -import jdk.nashorn.internal.ir.Node; -import jdk.nashorn.internal.ir.ObjectNode; -import jdk.nashorn.internal.ir.PropertyNode; -import jdk.nashorn.internal.ir.ReturnNode; -import jdk.nashorn.internal.ir.RuntimeNode; -import jdk.nashorn.internal.ir.SplitNode; -import jdk.nashorn.internal.ir.Statement; -import jdk.nashorn.internal.ir.SwitchNode; -import jdk.nashorn.internal.ir.TemplateLiteral; -import jdk.nashorn.internal.ir.TernaryNode; -import jdk.nashorn.internal.ir.ThrowNode; -import jdk.nashorn.internal.ir.TryNode; -import jdk.nashorn.internal.ir.UnaryNode; -import jdk.nashorn.internal.ir.VarNode; -import jdk.nashorn.internal.ir.WhileNode; -import jdk.nashorn.internal.ir.WithNode; -import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor; -import jdk.nashorn.internal.parser.Lexer; -import jdk.nashorn.internal.parser.TokenType; +import org.openjdk.nashorn.internal.ir.AccessNode; +import org.openjdk.nashorn.internal.ir.BinaryNode; +import org.openjdk.nashorn.internal.ir.Block; +import org.openjdk.nashorn.internal.ir.BlockStatement; +import org.openjdk.nashorn.internal.ir.BreakNode; +import org.openjdk.nashorn.internal.ir.CallNode; +import org.openjdk.nashorn.internal.ir.CaseNode; +import org.openjdk.nashorn.internal.ir.CatchNode; +import org.openjdk.nashorn.internal.ir.ClassNode; +import org.openjdk.nashorn.internal.ir.ContinueNode; +import org.openjdk.nashorn.internal.ir.DebuggerNode; +import org.openjdk.nashorn.internal.ir.EmptyNode; +import org.openjdk.nashorn.internal.ir.ErrorNode; +import org.openjdk.nashorn.internal.ir.Expression; +import org.openjdk.nashorn.internal.ir.ExpressionStatement; +import org.openjdk.nashorn.internal.ir.ForNode; +import org.openjdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.IdentNode; +import org.openjdk.nashorn.internal.ir.IfNode; +import org.openjdk.nashorn.internal.ir.IndexNode; +import org.openjdk.nashorn.internal.ir.LabelNode; +import org.openjdk.nashorn.internal.ir.LiteralNode; +import org.openjdk.nashorn.internal.ir.Node; +import org.openjdk.nashorn.internal.ir.ObjectNode; +import org.openjdk.nashorn.internal.ir.PropertyNode; +import org.openjdk.nashorn.internal.ir.ReturnNode; +import org.openjdk.nashorn.internal.ir.RuntimeNode; +import org.openjdk.nashorn.internal.ir.SplitNode; +import org.openjdk.nashorn.internal.ir.Statement; +import org.openjdk.nashorn.internal.ir.SwitchNode; +import org.openjdk.nashorn.internal.ir.TemplateLiteral; +import org.openjdk.nashorn.internal.ir.TernaryNode; +import org.openjdk.nashorn.internal.ir.ThrowNode; +import org.openjdk.nashorn.internal.ir.TryNode; +import org.openjdk.nashorn.internal.ir.UnaryNode; +import org.openjdk.nashorn.internal.ir.VarNode; +import org.openjdk.nashorn.internal.ir.WhileNode; +import org.openjdk.nashorn.internal.ir.WithNode; +import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor; +import org.openjdk.nashorn.internal.parser.Lexer; +import org.openjdk.nashorn.internal.parser.TokenType; /** * This class translates from nashorn IR Node objects diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IdentifierTree.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IdentifierTree.java index d6684fb93..66e72041f 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IdentifierTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an identifier expression. @@ -33,12 +33,8 @@ * name * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface IdentifierTree extends ExpressionTree { /** * Returns the name of this identifier. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IdentifierTreeImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IdentifierTreeImpl.java index a2af0dda8..eae1a8ba4 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IdentifierTreeImpl.java @@ -24,10 +24,10 @@ */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.IdentNode; -import jdk.nashorn.internal.ir.Module; +import org.openjdk.nashorn.internal.ir.IdentNode; +import org.openjdk.nashorn.internal.ir.Module; final class IdentifierTreeImpl extends ExpressionTreeImpl implements IdentifierTree { private final String name; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IfTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IfTree.java index e515dc0d5..a278f4b9d 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IfTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an 'if' statement. @@ -39,12 +39,8 @@ * elseStatement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface IfTree extends StatementTree { /** * Returns the condition expression of this 'if' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IfTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IfTreeImpl.java index f095531fa..26ce39d47 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/IfTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.IfNode; +import org.openjdk.nashorn.internal.ir.IfNode; final class IfTreeImpl extends StatementTreeImpl implements IfTree { private final ExpressionTree cond; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ImportEntryTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ImportEntryTree.java index 91212ff9f..00f40df59 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ImportEntryTree.java @@ -22,17 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * A Tree node for import entry of Module information. - * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. */ -@Deprecated(since="11", forRemoval=true) public interface ImportEntryTree extends Tree { /** * Returns the entry's module request. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ImportEntryTreeImpl.java similarity index 92% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ImportEntryTreeImpl.java index c0a023032..dd9381bca 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ImportEntryTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ImportEntryTreeImpl.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; import java.util.stream.Collectors; -import jdk.nashorn.internal.ir.FunctionNode; -import jdk.nashorn.internal.ir.IdentNode; -import jdk.nashorn.internal.ir.Module; -import static jdk.nashorn.api.tree.ModuleTreeImpl.identOrNull; +import org.openjdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.IdentNode; +import org.openjdk.nashorn.internal.ir.Module; +import static org.openjdk.nashorn.api.tree.ModuleTreeImpl.identOrNull; final class ImportEntryTreeImpl extends TreeImpl implements ImportEntryTree { private final long startPos, endPos; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/InstanceOfTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/InstanceOfTree.java index bf721fdce..12f70c8d6 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/InstanceOfTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for an 'instanceof' expression. @@ -33,12 +33,8 @@ * expression instanceof type * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface InstanceOfTree extends ExpressionTree { /** * Returns the expression whose type is being checked. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/InstanceOfTreeImpl.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/InstanceOfTreeImpl.java index 34714145e..80f7056d7 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/InstanceOfTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.BinaryNode; -import jdk.nashorn.internal.parser.TokenType; +import org.openjdk.nashorn.internal.ir.BinaryNode; +import org.openjdk.nashorn.internal.parser.TokenType; final class InstanceOfTreeImpl extends BinaryTreeImpl implements InstanceOfTree { InstanceOfTreeImpl(final BinaryNode node, diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LabeledStatementTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LabeledStatementTree.java index 39f2e9bf7..d572c79a3 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LabeledStatementTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a labeled statement. @@ -33,12 +33,8 @@ * label : statement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface LabeledStatementTree extends StatementTree { /** * Returns the label associated with this statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LabeledStatementTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LabeledStatementTreeImpl.java index 796dd4e5b..dc45aeaf0 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LabeledStatementTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.LabelNode; +import org.openjdk.nashorn.internal.ir.LabelNode; final class LabeledStatementTreeImpl extends StatementTreeImpl implements LabeledStatementTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LineMap.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LineMap.java index 08476e7dc..373402292 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMap.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LineMap.java @@ -23,18 +23,14 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * Provides methods to convert between character positions and line numbers * for a compilation unit. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface LineMap { /** * Find the line containing a position; a line termination diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LineMapImpl.java similarity index 94% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LineMapImpl.java index 7cfa4abca..62742ae17 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LineMapImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.runtime.Source; +import org.openjdk.nashorn.internal.runtime.Source; final class LineMapImpl implements LineMap { private final Source source; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LiteralTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LiteralTree.java index 9378bb24d..a526cb964 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LiteralTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a literal expression. @@ -34,12 +34,8 @@ * value * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface LiteralTree extends ExpressionTree { /** * Returns the value of this literal. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LiteralTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LiteralTreeImpl.java index 3335a4cb0..b5605f19e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LiteralTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.LiteralNode; +import org.openjdk.nashorn.internal.ir.LiteralNode; final class LiteralTreeImpl extends ExpressionTreeImpl implements LiteralTree { private final Object value; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LoopTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LoopTree.java index 2b0d38dfb..489996449 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/LoopTree.java @@ -23,17 +23,13 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A mixin for "loop" statements. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface LoopTree extends StatementTree { /** * Returns the statement contained in this 'loop' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/MemberSelectTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/MemberSelectTree.java index 70f779f07..bf8c1eb7c 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/MemberSelectTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a member access expression. @@ -33,12 +33,8 @@ * expression . identifier * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface MemberSelectTree extends ExpressionTree { /** * The object expression whose member is being selected. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/MemberSelectTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/MemberSelectTreeImpl.java index 61b6f403b..79c950984 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/MemberSelectTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.AccessNode; +import org.openjdk.nashorn.internal.ir.AccessNode; final class MemberSelectTreeImpl extends ExpressionTreeImpl implements MemberSelectTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ModuleTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ModuleTree.java index 52e06483f..0a70d1051 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ModuleTree.java @@ -22,17 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * A Tree node for Module information. - * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. */ -@Deprecated(since="11", forRemoval=true) public interface ModuleTree extends Tree { /** * Returns the list of import entries. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ModuleTreeImpl.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ModuleTreeImpl.java index df32b0914..885681a7e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ModuleTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ModuleTreeImpl.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; import java.util.stream.Collectors; -import jdk.nashorn.internal.ir.FunctionNode; -import jdk.nashorn.internal.ir.IdentNode; -import jdk.nashorn.internal.ir.Module; -import static jdk.nashorn.api.tree.ExportEntryTreeImpl.createExportList; -import static jdk.nashorn.api.tree.ImportEntryTreeImpl.createImportList; +import org.openjdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.ir.IdentNode; +import org.openjdk.nashorn.internal.ir.Module; +import static org.openjdk.nashorn.api.tree.ExportEntryTreeImpl.createExportList; +import static org.openjdk.nashorn.api.tree.ImportEntryTreeImpl.createImportList; final class ModuleTreeImpl extends TreeImpl implements ModuleTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/NewTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/NewTree.java index 06ebb4fe0..a49d502ed 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/NewTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node to declare a new instance of a class. @@ -35,12 +35,8 @@ * new identifier ( arguments ) * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface NewTree extends ExpressionTree { /** * Returns the constructor expression of this 'new' expression. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/NewTreeImpl.java similarity index 92% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/NewTreeImpl.java index 4bfec68ec..6234932e6 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/NewTreeImpl.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.UnaryNode; -import jdk.nashorn.internal.parser.TokenType; +import org.openjdk.nashorn.internal.ir.UnaryNode; +import org.openjdk.nashorn.internal.parser.TokenType; final class NewTreeImpl extends ExpressionTreeImpl implements NewTree { private final ExpressionTree constrExpr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ObjectLiteralTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ObjectLiteralTree.java index 402669fd8..2983cf218 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ObjectLiteralTree.java @@ -23,19 +23,15 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; /** * Represents ECMAScript object literal expression. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ObjectLiteralTree extends ExpressionTree { /** * Returns the list of properties of this object literal. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ObjectLiteralTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ObjectLiteralTreeImpl.java index cc0dfdf0d..c43b45081 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ObjectLiteralTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.ObjectNode; +import org.openjdk.nashorn.internal.ir.ObjectNode; final class ObjectLiteralTreeImpl extends ExpressionTreeImpl implements ObjectLiteralTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ParenthesizedTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ParenthesizedTree.java index d27a8a5f2..9a6e55637 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParenthesizedTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ParenthesizedTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a parenthesized expression. Note: parentheses @@ -34,12 +34,8 @@ * ( expression ) * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ParenthesizedTree extends ExpressionTree { /** * Returns the expression within the parenthesis. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Parser.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Parser.java index 40aef0a9d..d701a5c5e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Parser.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Parser.java @@ -23,25 +23,21 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.io.File; import java.io.IOException; import java.io.Reader; import java.net.URL; import java.nio.file.Path; -import jdk.nashorn.api.scripting.NashornException; -import jdk.nashorn.api.scripting.ScriptObjectMirror; +import org.openjdk.nashorn.api.scripting.NashornException; +import org.openjdk.nashorn.api.scripting.ScriptObjectMirror; /** * Represents nashorn ECMAScript parser instance. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface Parser { /** * Parses the source file and returns compilation unit tree diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ParserImpl.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ParserImpl.java index 5a10526fe..2a111bfa5 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ParserImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.io.File; import java.io.IOException; @@ -33,16 +33,16 @@ import java.util.Arrays; import java.util.Map; import java.util.Objects; -import jdk.nashorn.api.scripting.NashornException; -import jdk.nashorn.api.scripting.ScriptObjectMirror; -import jdk.nashorn.internal.ir.FunctionNode; -import jdk.nashorn.internal.runtime.Context; -import jdk.nashorn.internal.runtime.ErrorManager; -import jdk.nashorn.internal.runtime.JSType; -import jdk.nashorn.internal.runtime.ParserException; -import jdk.nashorn.internal.runtime.ScriptEnvironment; -import jdk.nashorn.internal.runtime.Source; -import jdk.nashorn.internal.runtime.options.Options; +import org.openjdk.nashorn.api.scripting.NashornException; +import org.openjdk.nashorn.api.scripting.ScriptObjectMirror; +import org.openjdk.nashorn.internal.ir.FunctionNode; +import org.openjdk.nashorn.internal.runtime.Context; +import org.openjdk.nashorn.internal.runtime.ErrorManager; +import org.openjdk.nashorn.internal.runtime.JSType; +import org.openjdk.nashorn.internal.runtime.ParserException; +import org.openjdk.nashorn.internal.runtime.ScriptEnvironment; +import org.openjdk.nashorn.internal.runtime.Source; +import org.openjdk.nashorn.internal.runtime.options.Options; final class ParserImpl implements Parser { @@ -184,9 +184,9 @@ private CompilationUnitTree makeModule(final Source src, final DiagnosticListene return new IRTranslator().translate(modFunc); } - private jdk.nashorn.internal.parser.Parser makeParser(final Source source, final DiagnosticListener listener) { + private org.openjdk.nashorn.internal.parser.Parser makeParser(final Source source, final DiagnosticListener listener) { final ErrorManager errMgr = listener != null ? new ListenerErrorManager(listener) : new Context.ThrowErrorManager(); - return new jdk.nashorn.internal.parser.Parser(env, source, errMgr); + return new org.openjdk.nashorn.internal.parser.Parser(env, source, errMgr); } private static class ListenerErrorManager extends ErrorManager { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/PropertyTree.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/PropertyTree.java index c23119c8e..e16dc64ab 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/PropertyTree.java @@ -23,17 +23,13 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * To represent property setting in an object literal tree. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface PropertyTree extends Tree { /** * Returns the name of this property. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/PropertyTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/PropertyTreeImpl.java index 1ba734ec7..bf6484526 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/PropertyTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.PropertyNode; +import org.openjdk.nashorn.internal.ir.PropertyNode; final class PropertyTreeImpl extends TreeImpl implements PropertyTree { private final ExpressionTree key; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/RegExpLiteralTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/RegExpLiteralTree.java index 152b9bad6..be318f0e8 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/RegExpLiteralTree.java @@ -23,17 +23,13 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * Represents regular expression literal in the source code. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface RegExpLiteralTree extends ExpressionTree { /** * Regular expression pattern to match. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/RegExpLiteralTreeImpl.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/RegExpLiteralTreeImpl.java index 451147a95..37fa9494e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/RegExpLiteralTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.LiteralNode; -import jdk.nashorn.internal.parser.Lexer; +import org.openjdk.nashorn.internal.ir.LiteralNode; +import org.openjdk.nashorn.internal.parser.Lexer; final class RegExpLiteralTreeImpl extends ExpressionTreeImpl implements RegExpLiteralTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ReturnTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ReturnTree.java index 0689c49ab..0390fb57e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ReturnTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'return' statement. @@ -34,12 +34,8 @@ * return expression; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ReturnTree extends StatementTree { /** * Returns the expression being returned. This is null if no value diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ReturnTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ReturnTreeImpl.java index 9eab46416..23f7016ae 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ReturnTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ReturnNode; +import org.openjdk.nashorn.internal.ir.ReturnNode; final class ReturnTreeImpl extends StatementTreeImpl implements ReturnTree { private final ExpressionTree expr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java similarity index 98% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java index 43705803a..793cc9aa3 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A simple implementation of the TreeVisitor for ECMAScript edition 5.1. @@ -40,16 +40,12 @@ * subclasses with {@link java.lang.Override @Override} will help * ensure that methods are overridden as intended. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @param the return type of this visitor's methods. Use {@link * Void} for visitors that do not need to return results. * @param

the type of the additional parameter to this visitor's * methods. Use {@code Void} for visitors that do not need an * additional parameter. */ -@Deprecated(since="11", forRemoval=true) public class SimpleTreeVisitorES5_1 implements TreeVisitor { @Override public R visitAssignment(final AssignmentTree node, final P r) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SimpleTreeVisitorES6.java similarity index 97% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SimpleTreeVisitorES6.java index d535f41a7..c6586e1c0 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES6.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SimpleTreeVisitorES6.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -42,16 +42,12 @@ * subclasses with {@link java.lang.Override @Override} will help * ensure that methods are overridden as intended. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @param the return type of this visitor's methods. Use {@link * Void} for visitors that do not need to return results. * @param

the type of the additional parameter to this visitor's * methods. Use {@code Void} for visitors that do not need an * additional parameter. */ -@Deprecated(since="11", forRemoval=true) public class SimpleTreeVisitorES6 extends SimpleTreeVisitorES5_1 { @Override public R visitCompilationUnit(final CompilationUnitTree node, final P r) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SpreadTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SpreadTree.java index 45b4263cb..908e51f80 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SpreadTree.java @@ -23,15 +23,11 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for spread operator in array elements, function call arguments. - * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. */ -@Deprecated(since="11", forRemoval=true) public interface SpreadTree extends ExpressionTree { /** * Returns the expression that is being spread. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SpreadTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SpreadTreeImpl.java index a01601f70..322d1cf88 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SpreadTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SpreadTreeImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.Expression; +import org.openjdk.nashorn.internal.ir.Expression; final class SpreadTreeImpl extends ExpressionTreeImpl implements SpreadTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/StatementTree.java similarity index 86% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/StatementTree.java index f2d0bf740..3e34bf54f 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/StatementTree.java @@ -23,17 +23,13 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node used as the base class for the different kinds of * statements. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface StatementTree extends Tree { } diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/StatementTreeImpl.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/StatementTreeImpl.java index 338b23ba2..77d420ade 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/StatementTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/StatementTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.Block; -import jdk.nashorn.internal.ir.Statement; +import org.openjdk.nashorn.internal.ir.Block; +import org.openjdk.nashorn.internal.ir.Statement; abstract class StatementTreeImpl extends TreeImpl implements StatementTree { StatementTreeImpl(final Statement stat) { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SwitchTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SwitchTree.java index dc1526522..d6d16faca 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SwitchTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -37,12 +37,8 @@ * } * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface SwitchTree extends StatementTree { /** * Returns the expression on which this statement switches. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SwitchTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SwitchTreeImpl.java index 19b23f9a3..6b82b7c2e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/SwitchTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.SwitchNode; +import org.openjdk.nashorn.internal.ir.SwitchNode; final class SwitchTreeImpl extends StatementTreeImpl implements SwitchTree { private final ExpressionTree expr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TemplateLiteralTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TemplateLiteralTree.java index ad799a698..d68a4e223 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TemplateLiteralTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -35,13 +35,9 @@ * `This is a String with ${computed} values in it` * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 * */ -@Deprecated(since="11", forRemoval=true) public interface TemplateLiteralTree extends ExpressionTree { /** * Returns the list of expressions in this template string diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TemplateLiteralTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TemplateLiteralTreeImpl.java index 87de44a14..3a3779791 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TemplateLiteralTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TemplateLiteralTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.Expression; +import org.openjdk.nashorn.internal.ir.Expression; final class TemplateLiteralTreeImpl extends ExpressionTreeImpl implements TemplateLiteralTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ThrowTree.java similarity index 87% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ThrowTree.java index b7d487059..bfd596320 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ThrowTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'throw' statement. @@ -33,12 +33,8 @@ * throw expression; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface ThrowTree extends StatementTree { /** * Returns the expression being thrown. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ThrowTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ThrowTreeImpl.java index 8d0776fcd..e72d6d6bb 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ThrowTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.ThrowNode; +import org.openjdk.nashorn.internal.ir.ThrowNode; final class ThrowTreeImpl extends StatementTreeImpl implements ThrowTree { private final ExpressionTree expr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Tree.java similarity index 97% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Tree.java index d732f1871..3500c24f2 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/Tree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/Tree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * Common interface for all nodes in an abstract syntax tree. @@ -31,21 +31,13 @@ *

WARNING: This interface and its sub-interfaces are * subject to change as the ECMAScript programming language evolves. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface Tree { /** * Enumerates all kinds of trees. - * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. */ - @Deprecated(since="11", forRemoval=true) public enum Kind { /** * Used for instances of {@link ArrayAccessTree}. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TreeImpl.java similarity index 97% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TreeImpl.java index 5ec1e2242..d84c9288e 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TreeImpl.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.Node; +import org.openjdk.nashorn.internal.ir.Node; -import jdk.nashorn.internal.parser.TokenType; +import org.openjdk.nashorn.internal.parser.TokenType; abstract class TreeImpl implements Tree { protected final Node node; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TreeVisitor.java similarity index 98% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TreeVisitor.java index 677df34fe..039920edf 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeVisitor.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TreeVisitor.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A visitor of trees, in the style of the visitor design pattern. @@ -45,9 +45,6 @@ this interface to accommodate new, currently unknown, language default method bodies will be introduced which will call visitUnknown method as a fallback. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @param the return type of this visitor's methods. Use {@link * Void} for visitors that do not need to return results. * @param

the type of the additional parameter to this visitor's @@ -56,7 +53,6 @@ this interface to accommodate new, currently unknown, language * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface TreeVisitor { /** * Visit assignment tree. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TryTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TryTree.java index 8aaad475d..37c05d1fa 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TryTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; @@ -39,12 +39,8 @@ * finallyBlock * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface TryTree extends StatementTree { /** * Returns the 'try' block of this 'try' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TryTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TryTreeImpl.java index e9aafff76..034747aa4 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/TryTreeImpl.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; import java.util.List; -import jdk.nashorn.internal.ir.TryNode; +import org.openjdk.nashorn.internal.ir.TryNode; final class TryTreeImpl extends StatementTreeImpl implements TryTree { private final BlockTree block; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnaryTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnaryTree.java index bcc6eb081..444a5a64a 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnaryTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for postfix and unary expressions. @@ -36,12 +36,8 @@ * expression operator * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface UnaryTree extends ExpressionTree { /** * Returns the expression operated by the unary operator. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnaryTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnaryTreeImpl.java index 6b72c2422..04504bff4 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnaryTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.UnaryNode; +import org.openjdk.nashorn.internal.ir.UnaryNode; class UnaryTreeImpl extends ExpressionTreeImpl implements UnaryTree { private final ExpressionTree expr; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnknownTreeException.java similarity index 93% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnknownTreeException.java index fc6015854..8bc583476 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnknownTreeException.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/UnknownTreeException.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** @@ -33,12 +33,8 @@ * {@linkplain TreeVisitor tree visitor} to indicate that the * visitor was created for a prior version of the language. * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public class UnknownTreeException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/VariableTree.java similarity index 91% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/VariableTree.java index e055ebdfa..b224eba41 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/VariableTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a variable declaration statement. @@ -34,12 +34,8 @@ * var binding_pattern [ initializer ]; * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface VariableTree extends StatementTree { /** * Returns the binding of this declaration. This is an {@link IdentifierTree} diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/VariableTreeImpl.java similarity index 96% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/VariableTreeImpl.java index a1e6f6f7e..259dd86d1 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/VariableTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.VarNode; +import org.openjdk.nashorn.internal.ir.VarNode; final class VariableTreeImpl extends StatementTreeImpl implements VariableTree { private final IdentifierTree ident; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WhileLoopTree.java similarity index 89% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WhileLoopTree.java index cfda19169..ac7f8375f 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WhileLoopTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'while' loop statement. @@ -34,12 +34,8 @@ * statement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface WhileLoopTree extends ConditionalLoopTree { /** * The condition expression of this 'while' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WhileLoopTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WhileLoopTreeImpl.java index 3bc1507d2..73609cfc4 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WhileLoopTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.WhileNode; +import org.openjdk.nashorn.internal.ir.WhileNode; final class WhileLoopTreeImpl extends StatementTreeImpl implements WhileLoopTree { private final ExpressionTree cond; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WithTree.java similarity index 88% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WithTree.java index f08085b2d..3b53fd2d8 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WithTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for a 'with' statement. @@ -34,12 +34,8 @@ * statement * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface WithTree extends StatementTree { /** * The scope object expression for this 'with' statement. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WithTreeImpl.java similarity index 95% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WithTreeImpl.java index 4b726551a..7a917d728 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/WithTreeImpl.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.WithNode; +import org.openjdk.nashorn.internal.ir.WithNode; final class WithTreeImpl extends StatementTreeImpl implements WithTree { private final ExpressionTree scope; diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/YieldTree.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/YieldTree.java index 8ba8e2011..80e166713 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTree.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/YieldTree.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; /** * A tree node for yield expressions used in generator functions. @@ -37,12 +37,8 @@ * } * * - * @deprecated Nashorn JavaScript script engine and APIs, and the jjs tool - * are deprecated with the intent to remove them in a future release. - * * @since 9 */ -@Deprecated(since="11", forRemoval=true) public interface YieldTree extends ExpressionTree { /** * Returns the expression that is yielded. diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/YieldTreeImpl.java similarity index 90% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/YieldTreeImpl.java index aea75d81a..9486233d9 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/YieldTreeImpl.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/YieldTreeImpl.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.nashorn.api.tree; +package org.openjdk.nashorn.api.tree; -import jdk.nashorn.internal.ir.Expression; -import jdk.nashorn.internal.ir.UnaryNode; -import jdk.nashorn.internal.parser.TokenType; +import org.openjdk.nashorn.internal.ir.Expression; +import org.openjdk.nashorn.internal.ir.UnaryNode; +import org.openjdk.nashorn.internal.parser.TokenType; final class YieldTreeImpl extends ExpressionTreeImpl implements YieldTree { diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/package-info.java similarity index 97% rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/package-info.java index 832de0b05..9112f42f1 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/package-info.java +++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/package-info.java @@ -37,7 +37,7 @@ * * 

  * 
- * import jdk.nashorn.api.tree.*;
+ * import org.openjdk.nashorn.api.tree.*;
  * import java.io.File;
  *
  * // Simple example that prints warning on 'with' statements
@@ -70,5 +70,4 @@
  *
  * @since 9
  */
-package jdk.nashorn.api.tree;
-
+package org.openjdk.nashorn.api.tree;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/AssertsEnabled.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/AssertsEnabled.java
index e47526581..28de6a937 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/AssertsEnabled.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/AssertsEnabled.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal;
+package org.openjdk.nashorn.internal;
 
 /**
  * Class that exposes the current state of asserts.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/IntDeque.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/IntDeque.java
index 477afcf94..d8e378db2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/IntDeque.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal;
+package org.openjdk.nashorn.internal;
 
 /**
  * Small helper class for fast int deques
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/WeakValueCache.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/WeakValueCache.java
index b1a1671e2..bcfc26fef 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/WeakValueCache.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/WeakValueCache.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal;
+package org.openjdk.nashorn.internal;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ApplySpecialization.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ApplySpecialization.java
index 51abacdbb..b16028bed 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ApplySpecialization.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS_VAR;
-import static jdk.nashorn.internal.codegen.CompilerConstants.EXPLODED_ARGUMENT_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS_VAR;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.EXPLODED_ARGUMENT_PREFIX;
 
 import java.lang.invoke.MethodType;
 import java.net.URL;
@@ -36,19 +36,19 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * An optimization that attempts to turn applies into calls. This pattern
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/AssignSymbols.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/AssignSymbols.java
index f01c7f9c2..cebdb29e7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/AssignSymbols.java
@@ -23,30 +23,30 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
-
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS_VAR;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.EXCEPTION_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ITERATOR_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.RETURN;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SWITCH_TAG_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import static jdk.nashorn.internal.ir.Symbol.HAS_OBJECT_VALUE;
-import static jdk.nashorn.internal.ir.Symbol.IS_CONST;
-import static jdk.nashorn.internal.ir.Symbol.IS_FUNCTION_SELF;
-import static jdk.nashorn.internal.ir.Symbol.IS_GLOBAL;
-import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
-import static jdk.nashorn.internal.ir.Symbol.IS_LET;
-import static jdk.nashorn.internal.ir.Symbol.IS_PARAM;
-import static jdk.nashorn.internal.ir.Symbol.IS_PROGRAM_LEVEL;
-import static jdk.nashorn.internal.ir.Symbol.IS_SCOPE;
-import static jdk.nashorn.internal.ir.Symbol.IS_THIS;
-import static jdk.nashorn.internal.ir.Symbol.IS_VAR;
-import static jdk.nashorn.internal.ir.Symbol.KINDMASK;
+package org.openjdk.nashorn.internal.codegen;
+
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS_VAR;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.EXCEPTION_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ITERATOR_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.RETURN;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SWITCH_TAG_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
+import static org.openjdk.nashorn.internal.ir.Symbol.HAS_OBJECT_VALUE;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_CONST;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_FUNCTION_SELF;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_GLOBAL;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_LET;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_PARAM;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_PROGRAM_LEVEL;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_SCOPE;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_THIS;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_VAR;
+import static org.openjdk.nashorn.internal.ir.Symbol.KINDMASK;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -58,40 +58,40 @@
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BaseNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.LexicalContextNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.RuntimeNode.Request;
-import jdk.nashorn.internal.ir.Splittable;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSErrorType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BaseNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.LexicalContextNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode.Request;
+import org.openjdk.nashorn.internal.ir.Splittable;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSErrorType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * This visitor assigns symbols to identifiers denoting variables. It does few more minor calculations that are only
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/BranchOptimizer.java
similarity index 87%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/BranchOptimizer.java
index 99862fe92..dd0c8e066 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/BranchOptimizer.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
-
-import static jdk.nashorn.internal.codegen.Condition.EQ;
-import static jdk.nashorn.internal.codegen.Condition.GE;
-import static jdk.nashorn.internal.codegen.Condition.GT;
-import static jdk.nashorn.internal.codegen.Condition.LE;
-import static jdk.nashorn.internal.codegen.Condition.LT;
-import static jdk.nashorn.internal.codegen.Condition.NE;
-import static jdk.nashorn.internal.parser.TokenType.NOT;
-
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.LocalVariableConversion;
-import jdk.nashorn.internal.ir.UnaryNode;
+package org.openjdk.nashorn.internal.codegen;
+
+import static org.openjdk.nashorn.internal.codegen.Condition.EQ;
+import static org.openjdk.nashorn.internal.codegen.Condition.GE;
+import static org.openjdk.nashorn.internal.codegen.Condition.GT;
+import static org.openjdk.nashorn.internal.codegen.Condition.LE;
+import static org.openjdk.nashorn.internal.codegen.Condition.LT;
+import static org.openjdk.nashorn.internal.codegen.Condition.NE;
+import static org.openjdk.nashorn.internal.parser.TokenType.NOT;
+
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.LocalVariableConversion;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
 
 /**
  * Branch optimizer for CodeGenerator. Given a jump condition this helper
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CacheAst.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CacheAst.java
index 6f66ea34c..d7ce77d9f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CacheAst.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CacheAst.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.util.ArrayDeque;
 import java.util.Collections;
 import java.util.Deque;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
 
 class CacheAst extends SimpleNodeVisitor {
     private final Deque dataStack = new ArrayDeque<>();
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ClassEmitter.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ClassEmitter.java
index c01ddcb64..72a4d4bbe 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ClassEmitter.java
@@ -23,34 +23,34 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_VARARGS;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEINTERFACE;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESPECIAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_NEWINVOKESPECIAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CLINIT;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.GET_ARRAY_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.GET_ARRAY_SUFFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
-import static jdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
-import static jdk.nashorn.internal.codegen.CompilerConstants.INIT;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SET_MAP;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.className;
-import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
-import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+package org.openjdk.nashorn.internal.codegen;
+
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+import static org.objectweb.asm.Opcodes.ACC_SUPER;
+import static org.objectweb.asm.Opcodes.ACC_VARARGS;
+import static org.objectweb.asm.Opcodes.H_INVOKEINTERFACE;
+import static org.objectweb.asm.Opcodes.H_INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL;
+import static org.objectweb.asm.Opcodes.H_NEWINVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.V1_7;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CLINIT;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.GET_ARRAY_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.GET_ARRAY_SUFFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.INIT;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SET_MAP;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.className;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
@@ -60,18 +60,18 @@
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.util.TraceClassVisitor;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.debug.NashornClassReader;
-import jdk.nashorn.internal.ir.debug.NashornTextifier;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.RewriteException;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Source;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.util.TraceClassVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.debug.NashornClassReader;
+import org.openjdk.nashorn.internal.ir.debug.NashornTextifier;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.RewriteException;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.Source;
 
 /**
  * The interface responsible for speaking to ASM, emitting classes,
@@ -207,7 +207,7 @@ protected String getCommonSuperClass(final String type1, final String type2) {
         this.unitClassName        = unitClassName;
         this.constantMethodNeeded = new HashSet<>();
 
-        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, pathName(jdk.nashorn.internal.scripts.JS.class.getName()), null);
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, pathName(org.openjdk.nashorn.internal.scripts.JS.class.getName()), null);
         cw.visitSource(sourceName, null);
 
         defineCommonStatics(strictMode);
@@ -420,7 +420,7 @@ public void end() {
             final MethodEmitter initMethod = init(EnumSet.of(Flag.PRIVATE));
             initMethod.begin();
             initMethod.load(Type.OBJECT, 0);
-            initMethod.newInstance(jdk.nashorn.internal.scripts.JS.class);
+            initMethod.newInstance(org.openjdk.nashorn.internal.scripts.JS.class);
             initMethod.returnVoid();
             initMethod.end();
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGenerator.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGenerator.java
index 212282965..fdaf1a0eb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGenerator.java
@@ -23,36 +23,36 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
-
-import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.PRIVATE;
-import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.STATIC;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CREATE_PROGRAM_FUNCTION;
-import static jdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
-import static jdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
-import static jdk.nashorn.internal.codegen.CompilerConstants.QUICK_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.REGEX_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
-import static jdk.nashorn.internal.ir.Symbol.HAS_SLOT;
-import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_APPLY_TO_CALL;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_DECLARE;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FAST_SCOPE;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_SCOPE;
+package org.openjdk.nashorn.internal.codegen;
+
+import static org.openjdk.nashorn.internal.codegen.ClassEmitter.Flag.PRIVATE;
+import static org.openjdk.nashorn.internal.codegen.ClassEmitter.Flag.STATIC;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CREATE_PROGRAM_FUNCTION;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.QUICK_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.REGEX_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.ir.Symbol.HAS_SLOT;
+import static org.openjdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_APPLY_TO_CALL;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_DECLARE;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FAST_SCOPE;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_SCOPE;
 
 import java.io.PrintWriter;
 import java.util.ArrayDeque;
@@ -72,90 +72,90 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Supplier;
-import jdk.nashorn.internal.AssertsEnabled;
-import jdk.nashorn.internal.IntDeque;
-import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.types.ArrayType;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BaseNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.EmptyNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.GetSplitState;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.JumpStatement;
-import jdk.nashorn.internal.ir.JumpToInlinedFinally;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LexicalContextNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.PrimitiveLiteralNode;
-import jdk.nashorn.internal.ir.LocalVariableConversion;
-import jdk.nashorn.internal.ir.LoopNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.Optimistic;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.RuntimeNode.Request;
-import jdk.nashorn.internal.ir.SetSplitState;
-import jdk.nashorn.internal.ir.SplitReturn;
-import jdk.nashorn.internal.ir.Splittable;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.parser.Lexer.RegexToken;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.OptimisticReturnFilters;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.RewriteException;
-import jdk.nashorn.internal.runtime.Scope;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.AssertsEnabled;
+import org.openjdk.nashorn.internal.IntDeque;
+import org.openjdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.types.ArrayType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BaseNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.EmptyNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.GetSplitState;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.JumpStatement;
+import org.openjdk.nashorn.internal.ir.JumpToInlinedFinally;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LexicalContextNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.PrimitiveLiteralNode;
+import org.openjdk.nashorn.internal.ir.LocalVariableConversion;
+import org.openjdk.nashorn.internal.ir.LoopNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.Optimistic;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode.Request;
+import org.openjdk.nashorn.internal.ir.SetSplitState;
+import org.openjdk.nashorn.internal.ir.SplitReturn;
+import org.openjdk.nashorn.internal.ir.Splittable;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.parser.Lexer.RegexToken;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.OptimisticReturnFilters;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.RewriteException;
+import org.openjdk.nashorn.internal.runtime.Scope;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This is the lowest tier of the code generator. It takes lowered ASTs emitted
@@ -4666,7 +4666,7 @@ private MethodEmitter globalRegExpCopy() {
 
     private MethodEmitter globalAllocateArray(final ArrayType type) {
         //make sure the native array is treated as an array type
-        return method.invokestatic(GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Ljdk/nashorn/internal/objects/NativeArray;");
+        return method.invokestatic(GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Lorg/openjdk/nashorn/internal/objects/NativeArray;");
     }
 
     private MethodEmitter globalIsEval() {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
index d38126f97..c129d3303 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.util.ArrayDeque;
 import java.util.Collection;
@@ -31,16 +31,16 @@
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.nashorn.internal.IntDeque;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LexicalContextNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.IntDeque;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LexicalContextNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.WithNode;
 
 /**
  * A lexical context that also tracks if we have any dynamic scopes in the context. Such scopes can have new
@@ -299,4 +299,3 @@ int quickSlot(final Type type) {
         return methodEmitters.peek().defineTemporaryLocalVariable(type.getSlots());
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilationException.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilationException.java
index 66fa32405..ea4cca667 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilationException.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 /**
  * Exception when something in the compiler breaks down. Can only
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilationPhase.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilationPhase.java
index 9209129f2..b93fa5404 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilationPhase.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.logging.DebugLogger.quote;
+import static org.openjdk.nashorn.internal.runtime.logging.DebugLogger.quote;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
@@ -33,20 +33,20 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
-import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.runtime.CodeInstaller;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.codegen.Compiler.CompilationPhases;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.debug.ASTWriter;
+import org.openjdk.nashorn.internal.ir.debug.PrintVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.runtime.CodeInstaller;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
 
 /**
  * A compilation phase is a step in the processes of turning a JavaScript
@@ -558,10 +558,10 @@ public String toString() {
 
     static final CompilationPhase INSTALL_PHASE = new InstallPhase();
 
-    /** start time of transform - used for timing, see {@link jdk.nashorn.internal.runtime.Timing} */
+    /** start time of transform - used for timing, see {@link org.openjdk.nashorn.internal.runtime.Timing} */
     private long startTime;
 
-    /** start time of transform - used for timing, see {@link jdk.nashorn.internal.runtime.Timing} */
+    /** start time of transform - used for timing, see {@link org.openjdk.nashorn.internal.runtime.Timing} */
     private long endTime;
 
     /** boolean that is true upon transform completion */
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompileUnit.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompileUnit.java
index 07347cf3e..d2025d0da 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompileUnit.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -33,9 +33,9 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
-import jdk.nashorn.internal.ir.CompileUnitHolder;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.ir.CompileUnitHolder;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
 
 /**
   * Used to track split class compilation. Note that instances of the class are serializable, but all fields are
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Compiler.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Compiler.java
index f3f847ed2..58e938116 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Compiler.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.RETURN;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import static jdk.nashorn.internal.runtime.logging.DebugLogger.quote;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.RETURN;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
+import static org.openjdk.nashorn.internal.runtime.logging.DebugLogger.quote;
 
 import java.io.File;
 import java.lang.invoke.MethodType;
@@ -49,24 +49,24 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.logging.Level;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.Optimistic;
-import jdk.nashorn.internal.runtime.CodeInstaller;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.FunctionInitializer;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.linker.NameCodec;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.Optimistic;
+import org.openjdk.nashorn.internal.runtime.CodeInstaller;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.FunctionInitializer;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.linker.NameCodec;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Responsible for converting JavaScripts to java byte code. Main entry
@@ -78,10 +78,10 @@
 public final class Compiler implements Loggable {
 
     /** Name of the scripts package */
-    public static final String SCRIPTS_PACKAGE = "jdk/nashorn/internal/scripts";
+    public static final String SCRIPTS_PACKAGE = "org/openjdk/nashorn/internal/scripts";
 
     /** Name of the objects package */
-    public static final String OBJECTS_PACKAGE = "jdk/nashorn/internal/objects";
+    public static final String OBJECTS_PACKAGE = "org/openjdk/nashorn/internal/objects";
 
     private final ScriptEnvironment env;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilerConstants.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilerConstants.java
index 28bd19f87..e8c9d3655 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilerConstants.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Source;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.Source;
 
 /**
  * This class represents constant names of variables, methods and fields in
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Condition.java
similarity index 71%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Condition.java
index 27402ed81..4bb9c9b81 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Condition.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.IFEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFGE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFGT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFLE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFLT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFNE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPNE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPNE;
+import static org.objectweb.asm.Opcodes.IFEQ;
+import static org.objectweb.asm.Opcodes.IFGE;
+import static org.objectweb.asm.Opcodes.IFGT;
+import static org.objectweb.asm.Opcodes.IFLE;
+import static org.objectweb.asm.Opcodes.IFLT;
+import static org.objectweb.asm.Opcodes.IFNE;
+import static org.objectweb.asm.Opcodes.IF_ACMPEQ;
+import static org.objectweb.asm.Opcodes.IF_ACMPNE;
+import static org.objectweb.asm.Opcodes.IF_ICMPEQ;
+import static org.objectweb.asm.Opcodes.IF_ICMPGE;
+import static org.objectweb.asm.Opcodes.IF_ICMPGT;
+import static org.objectweb.asm.Opcodes.IF_ICMPLE;
+import static org.objectweb.asm.Opcodes.IF_ICMPLT;
+import static org.objectweb.asm.Opcodes.IF_ICMPNE;
 
 /**
  * Condition enum used for all kinds of jumps, regardless of type
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ConstantData.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ConstantData.java
index 91faea874..c4f612a62 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ConstantData.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,7 +32,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import jdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
 
 /**
  * Manages constants needed by code generation.  Objects are maintained in an
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/DumpBytecode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/DumpBytecode.java
index 55de34056..f682fd62f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/DumpBytecode.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
 
 /**
  * Class that facilitates printing bytecode and dumping it to disk.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FieldObjectCreator.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FieldObjectCreator.java
index 77b612f08..1c3795905 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FieldObjectCreator.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldName;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getPaddedFieldCount;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldName;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.getPaddedFieldCount;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
 
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
 
 /**
  * Analyze an object's characteristics for appropriate code generation. This
@@ -49,7 +49,7 @@
  * to assign to the various fields in the object. This is done by the generated code
  *
  * @param  the value type for the fields being written on object creation, e.g. Node
- * @see jdk.nashorn.internal.ir.Node
+ * @see org.openjdk.nashorn.internal.ir.Node
  */
 public abstract class FieldObjectCreator extends ObjectCreator {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FindScopeDepths.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FindScopeDepths.java
index 40c529a8d..b778bbc52 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FindScopeDepths.java
@@ -23,28 +23,28 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.logging.DebugLogger.quote;
+import static org.openjdk.nashorn.internal.runtime.logging.DebugLogger.quote;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Establishes depth of scope for non local symbols at the start of method.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java
index d66a2e9e3..3f7d2ccfe 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FoldConstants.java
@@ -23,36 +23,36 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.EmptyNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.EmptyNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Simple constant folding pass, executed before IR is starting to be lowered.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FunctionSignature.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FunctionSignature.java
index ab80c3d3a..b21f62fa4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/FunctionSignature.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodType;
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
 /**
  * Class that generates function signatures for dynamic calls
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Label.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Label.java
index a54f35e6c..4502fbdf4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Label.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
-import jdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.codegen.types.Type;
 
 /**
  * Abstraction for labels, separating a label from the underlying
@@ -497,7 +497,7 @@ public String toString() {
     private transient Label.Stack stack;
 
     /** ASM representation of this label */
-    private transient jdk.internal.org.objectweb.asm.Label label;
+    private transient org.objectweb.asm.Label label;
 
     /** Id for debugging purposes, remove if footprint becomes unmanageable */
     private final int id;
@@ -529,9 +529,9 @@ public Label(final Label label) {
         this.id   = label.id;
     }
 
-    jdk.internal.org.objectweb.asm.Label getLabel() {
+    org.objectweb.asm.Label getLabel() {
         if (this.label == null) {
-            this.label = new jdk.internal.org.objectweb.asm.Label();
+            this.label = new org.objectweb.asm.Label();
         }
         return label;
     }
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
index 8ee1e9e5c..31300c1a5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/LocalStateRestorationInfo.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import jdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.codegen.types.Type;
 
 /**
  * Encapsulates the information for restoring the local state when continuing execution after a rewrite triggered by
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
index 154686999..165be5a32 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.RETURN;
-import static jdk.nashorn.internal.ir.Expression.isAlwaysFalse;
-import static jdk.nashorn.internal.ir.Expression.isAlwaysTrue;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.RETURN;
+import static org.openjdk.nashorn.internal.ir.Expression.isAlwaysFalse;
+import static org.openjdk.nashorn.internal.ir.Expression.isAlwaysTrue;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -41,56 +41,56 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BaseNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.BreakableNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.GetSplitState;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JoinPredecessor;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.JumpStatement;
-import jdk.nashorn.internal.ir.JumpToInlinedFinally;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LexicalContextNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.LocalVariableConversion;
-import jdk.nashorn.internal.ir.LoopNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.RuntimeNode.Request;
-import jdk.nashorn.internal.ir.SplitReturn;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BaseNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.BreakableNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.GetSplitState;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessor;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.JumpStatement;
+import org.openjdk.nashorn.internal.ir.JumpToInlinedFinally;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LexicalContextNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.LocalVariableConversion;
+import org.openjdk.nashorn.internal.ir.LoopNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode.Request;
+import org.openjdk.nashorn.internal.ir.SplitReturn;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * Calculates types for local variables. For purposes of local variable type calculation, the only types used are
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Lower.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Lower.java
index 4c50be22a..56b5357f4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Lower.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.EVAL;
-import static jdk.nashorn.internal.codegen.CompilerConstants.RETURN;
-import static jdk.nashorn.internal.ir.Expression.isAlwaysTrue;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.EVAL;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.RETURN;
+import static org.openjdk.nashorn.internal.ir.Expression.isAlwaysTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,60 +35,60 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.regex.Pattern;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BaseNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockLexicalContext;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ClassNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.DebuggerNode;
-import jdk.nashorn.internal.ir.EmptyNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JumpStatement;
-import jdk.nashorn.internal.ir.JumpToInlinedFinally;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.PrimitiveLiteralNode;
-import jdk.nashorn.internal.ir.LoopNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BaseNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockLexicalContext;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ClassNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.DebuggerNode;
+import org.openjdk.nashorn.internal.ir.EmptyNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JumpStatement;
+import org.openjdk.nashorn.internal.ir.JumpToInlinedFinally;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.PrimitiveLiteralNode;
+import org.openjdk.nashorn.internal.ir.LoopNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Lower to more primitive operations. After lowering, an AST still has no symbols
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MapCreator.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MapCreator.java
index be99db99c..7b35df7bb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MapCreator.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
 
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.runtime.AccessorProperty;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.SpillProperty;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.runtime.AccessorProperty;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.SpillProperty;
 
 /**
  * Class that creates PropertyMap sent to script object constructors.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MapTuple.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MapTuple.java
index 44cdc8b2c..c8ef2e5d9 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MapTuple.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Symbol;
 
 /**
  * A tuple of values used for map creation
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MethodEmitter.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MethodEmitter.java
index f45f65dc7..ae9d77050 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/MethodEmitter.java
@@ -23,56 +23,56 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.ATHROW;
-import static jdk.internal.org.objectweb.asm.Opcodes.CHECKCAST;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP2;
-import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD;
-import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.GOTO;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEINTERFACE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFGE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFGT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFLE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFLT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFNE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFNONNULL;
-import static jdk.internal.org.objectweb.asm.Opcodes.IFNULL;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPNE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPNE;
-import static jdk.internal.org.objectweb.asm.Opcodes.INSTANCEOF;
-import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE;
-import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.NEW;
-import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD;
-import static jdk.internal.org.objectweb.asm.Opcodes.PUTSTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS_DEBUGGER;
-import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.className;
-import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticField;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
-import static jdk.nashorn.internal.runtime.linker.NameCodec.EMPTY_NAME;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
+package org.openjdk.nashorn.internal.codegen;
+
+import static org.objectweb.asm.Opcodes.ATHROW;
+import static org.objectweb.asm.Opcodes.CHECKCAST;
+import static org.objectweb.asm.Opcodes.DUP2;
+import static org.objectweb.asm.Opcodes.GETFIELD;
+import static org.objectweb.asm.Opcodes.GETSTATIC;
+import static org.objectweb.asm.Opcodes.GOTO;
+import static org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.H_INVOKEINTERFACE;
+import static org.objectweb.asm.Opcodes.IFEQ;
+import static org.objectweb.asm.Opcodes.IFGE;
+import static org.objectweb.asm.Opcodes.IFGT;
+import static org.objectweb.asm.Opcodes.IFLE;
+import static org.objectweb.asm.Opcodes.IFLT;
+import static org.objectweb.asm.Opcodes.IFNE;
+import static org.objectweb.asm.Opcodes.IFNONNULL;
+import static org.objectweb.asm.Opcodes.IFNULL;
+import static org.objectweb.asm.Opcodes.IF_ACMPEQ;
+import static org.objectweb.asm.Opcodes.IF_ACMPNE;
+import static org.objectweb.asm.Opcodes.IF_ICMPEQ;
+import static org.objectweb.asm.Opcodes.IF_ICMPGE;
+import static org.objectweb.asm.Opcodes.IF_ICMPGT;
+import static org.objectweb.asm.Opcodes.IF_ICMPLE;
+import static org.objectweb.asm.Opcodes.IF_ICMPLT;
+import static org.objectweb.asm.Opcodes.IF_ICMPNE;
+import static org.objectweb.asm.Opcodes.INSTANCEOF;
+import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static org.objectweb.asm.Opcodes.NEW;
+import static org.objectweb.asm.Opcodes.PUTFIELD;
+import static org.objectweb.asm.Opcodes.PUTSTATIC;
+import static org.objectweb.asm.Opcodes.RETURN;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.THIS_DEBUGGER;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.className;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticField;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
+import static org.openjdk.nashorn.internal.runtime.linker.NameCodec.EMPTY_NAME;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
 
 import java.io.PrintStream;
 import java.lang.reflect.Array;
@@ -81,37 +81,37 @@
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
-import jdk.nashorn.internal.codegen.types.ArrayType;
-import jdk.nashorn.internal.codegen.types.BitwiseType;
-import jdk.nashorn.internal.codegen.types.NumericType;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.JoinPredecessor;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LocalVariableConversion;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.runtime.ArgumentSetter;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.RewriteException;
-import jdk.nashorn.internal.runtime.Scope;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.NameCodec;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
+import org.openjdk.nashorn.internal.codegen.types.ArrayType;
+import org.openjdk.nashorn.internal.codegen.types.BitwiseType;
+import org.openjdk.nashorn.internal.codegen.types.NumericType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessor;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LocalVariableConversion;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.runtime.ArgumentSetter;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.RewriteException;
+import org.openjdk.nashorn.internal.runtime.Scope;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.NameCodec;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This is the main function responsible for emitting method code
@@ -810,7 +810,7 @@ MethodEmitter loadNull() {
      */
     MethodEmitter loadType(final String className) {
         debug("load type", className);
-        method.visitLdcInsn(jdk.internal.org.objectweb.asm.Type.getObjectType(className));
+        method.visitLdcInsn(org.objectweb.asm.Type.getObjectType(className));
         pushType(Type.OBJECT);
         return this;
     }
@@ -1116,11 +1116,11 @@ void store(final IdentNode ident) {
      */
     private static class LocalVariableDef {
         // The start label from where this definition lives.
-        private final jdk.internal.org.objectweb.asm.Label label;
+        private final org.objectweb.asm.Label label;
         // The currently live type of the local variable.
         private final Type type;
 
-        LocalVariableDef(final jdk.internal.org.objectweb.asm.Label label, final Type type) {
+        LocalVariableDef(final org.objectweb.asm.Label label, final Type type) {
             this.label = label;
             this.type = type;
         }
@@ -1147,7 +1147,7 @@ void markDeadSlots(final int firstSlot, final int slotCount) {
         stack.markDeadLocalVariables(firstSlot, slotCount);
     }
 
-    private void endLocalValueDef(final Symbol symbol, final LocalVariableDef def, final jdk.internal.org.objectweb.asm.Label label) {
+    private void endLocalValueDef(final Symbol symbol, final LocalVariableDef def, final org.objectweb.asm.Label label) {
         String name = symbol.getName();
         if (name.equals(THIS.symbolName())) {
             name = THIS_DEBUGGER.symbolName();
@@ -1176,7 +1176,7 @@ void store(final Symbol symbol, final Type type, final boolean onlySymbolLiveVal
             final boolean isLiveType = symbol.hasSlotFor(type);
             final LocalVariableDef existingDef = localVariableDefs.get(symbol);
             if(existingDef == null || existingDef.type != type) {
-                final jdk.internal.org.objectweb.asm.Label here = new jdk.internal.org.objectweb.asm.Label();
+                final org.objectweb.asm.Label here = new org.objectweb.asm.Label();
                 if(isLiveType) {
                     final LocalVariableDef newDef = new LocalVariableDef(here, type);
                     localVariableDefs.put(symbol, newDef);
@@ -1537,8 +1537,8 @@ MethodEmitter invokeinterface(final String className, final String methodName, f
         return invoke(INVOKEINTERFACE, className, methodName, methodDescriptor, true);
     }
 
-    static jdk.internal.org.objectweb.asm.Label[] getLabels(final Label... table) {
-        final jdk.internal.org.objectweb.asm.Label[] internalLabels = new jdk.internal.org.objectweb.asm.Label[table.length];
+    static org.objectweb.asm.Label[] getLabels(final Label... table) {
+        final org.objectweb.asm.Label[] internalLabels = new org.objectweb.asm.Label[table.length];
         for (int i = 0; i < table.length; i++) {
             internalLabels[i] = table[i].getLabel();
         }
@@ -2532,7 +2532,7 @@ void putStatic(final String className, final String fieldName, final String fiel
     void lineNumber(final int line) {
         if (context.getEnv()._debug_lines) {
             debug_label("[LINE]", line);
-            final jdk.internal.org.objectweb.asm.Label l = new jdk.internal.org.objectweb.asm.Label();
+            final org.objectweb.asm.Label l = new org.objectweb.asm.Label();
             method.visitLabel(l);
             method.visitLineNumber(line, l);
         }
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Namespace.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Namespace.java
index 08ae356ed..1e73d8bd7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Namespace.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.MethodEmitter.LARGE_STRING_THRESHOLD;
+import static org.openjdk.nashorn.internal.codegen.MethodEmitter.LARGE_STRING_THRESHOLD;
 
 import java.util.HashMap;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ObjectClassGenerator.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ObjectClassGenerator.java
index 72689175a..ca27b38df 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ObjectClassGenerator.java
@@ -23,28 +23,28 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
-
-import static jdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_ARGUMENTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_MAP;
-import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_SCOPE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.JAVA_THIS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_DUAL_FIELD_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_SINGLE_FIELD_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.className;
-import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.JSType.CONVERT_OBJECT;
-import static jdk.nashorn.internal.runtime.JSType.CONVERT_OBJECT_OPTIMISTIC;
-import static jdk.nashorn.internal.runtime.JSType.GET_UNDEFINED;
-import static jdk.nashorn.internal.runtime.JSType.TYPE_DOUBLE_INDEX;
-import static jdk.nashorn.internal.runtime.JSType.TYPE_INT_INDEX;
-import static jdk.nashorn.internal.runtime.JSType.TYPE_OBJECT_INDEX;
-import static jdk.nashorn.internal.runtime.JSType.TYPE_UNDEFINED_INDEX;
-import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+package org.openjdk.nashorn.internal.codegen;
+
+import static org.openjdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.INIT_ARGUMENTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.INIT_MAP;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.INIT_SCOPE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.JAVA_THIS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_DUAL_FIELD_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_SINGLE_FIELD_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.className;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.JSType.CONVERT_OBJECT;
+import static org.openjdk.nashorn.internal.runtime.JSType.CONVERT_OBJECT_OPTIMISTIC;
+import static org.openjdk.nashorn.internal.runtime.JSType.GET_UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.JSType.TYPE_DOUBLE_INDEX;
+import static org.openjdk.nashorn.internal.runtime.JSType.TYPE_INT_INDEX;
+import static org.openjdk.nashorn.internal.runtime.JSType.TYPE_OBJECT_INDEX;
+import static org.openjdk.nashorn.internal.runtime.JSType.TYPE_UNDEFINED_INDEX;
+import static org.openjdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -53,21 +53,21 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.AccessorProperty;
-import jdk.nashorn.internal.runtime.AllocationStrategy;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.FunctionScope;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.AccessorProperty;
+import org.openjdk.nashorn.internal.runtime.AllocationStrategy;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.FunctionScope;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Generates the ScriptObject subclass structure with fields for a user objects.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ObjectCreator.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ObjectCreator.java
index 9d4efecb8..bbd42a458 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ObjectCreator.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
 
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Base class for object creation code generation.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
similarity index 85%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
index 42f017f3b..c439a0438 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
@@ -23,39 +23,39 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 
 import java.util.ArrayDeque;
 import java.util.BitSet;
 import java.util.Deque;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LoopNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.Optimistic;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LoopNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.Optimistic;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Assigns optimistic types to expressions that can have them. This class mainly contains logic for which expressions
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
index b793a68d6..ad8544d35 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/OptimisticTypesPersistence.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -59,12 +59,12 @@
 import java.util.function.IntFunction;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * 
Static utility that encapsulates persistence of type information for functions compiled with optimistic
@@ -562,7 +562,7 @@ private static int getMaxFiles() {
         return Math.max(0, Integer.parseInt(str));
     }
 
-    private static final String JRT_NASHORN_DIR = "/modules/jdk.scripting.nashorn";
+    private static final String JRT_NASHORN_DIR = "/modules/org.openjdk.nashorn";
 
     // version directory name if nashorn is loaded from jrt:/ URL
     private static String getJrtVersionDirName() throws Exception {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ProgramPoints.java
similarity index 79%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ProgramPoints.java
index bfc47eab7..3c524fb10 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ProgramPoints.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.FIRST_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.MAX_PROGRAM_POINT_VALUE;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.FIRST_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.MAX_PROGRAM_POINT_VALUE;
 
 import java.util.HashSet;
 import java.util.Set;
-import jdk.nashorn.internal.IntDeque;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Optimistic;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.IntDeque;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Optimistic;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
 
 /**
  * Find program points in the code that are needed for optimistic assumptions
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ReplaceCompileUnits.java
similarity index 87%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ReplaceCompileUnits.java
index 594ba668d..dfbdd2319 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ReplaceCompileUnits.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ReplaceCompileUnits.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.ir.CompileUnitHolder;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.Splittable;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.ir.CompileUnitHolder;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.Splittable;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
 
 /**
  * Base class for a node visitor that replaces {@link CompileUnit}s in {@link CompileUnitHolder}s.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SharedScopeCall.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SharedScopeCall.java
index 0d7e54995..c71a9adac 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_OPTIMISTIC;
 
 import java.util.Arrays;
 import java.util.EnumSet;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * A scope call or get operation that can be shared by several call sites. This generates a static
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SpillObjectCreator.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SpillObjectCreator.java
index c23920bf7..488ddb539 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SpillObjectCreator.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
 
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.scripts.JD;
-import jdk.nashorn.internal.scripts.JO;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.scripts.JD;
+import org.openjdk.nashorn.internal.scripts.JO;
 
 /**
  * An object creator that uses spill properties.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SplitIntoFunctions.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SplitIntoFunctions.java
index 1054fae29..e366bd2b6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/SplitIntoFunctions.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.ir.Node.NO_FINISH;
-import static jdk.nashorn.internal.ir.Node.NO_LINE_NUMBER;
-import static jdk.nashorn.internal.ir.Node.NO_TOKEN;
+import static org.openjdk.nashorn.internal.ir.Node.NO_FINISH;
+import static org.openjdk.nashorn.internal.ir.Node.NO_LINE_NUMBER;
+import static org.openjdk.nashorn.internal.ir.Node.NO_TOKEN;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -36,34 +36,34 @@
 import java.util.Deque;
 import java.util.List;
 import java.util.Objects;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockLexicalContext;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.GetSplitState;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.JumpStatement;
-import jdk.nashorn.internal.ir.JumpToInlinedFinally;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.SetSplitState;
-import jdk.nashorn.internal.ir.SplitNode;
-import jdk.nashorn.internal.ir.SplitReturn;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockLexicalContext;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.GetSplitState;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.JumpStatement;
+import org.openjdk.nashorn.internal.ir.JumpToInlinedFinally;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.SetSplitState;
+import org.openjdk.nashorn.internal.ir.SplitNode;
+import org.openjdk.nashorn.internal.ir.SplitReturn;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * A node visitor that replaces {@link SplitNode}s with anonymous function invocations and some additional constructs
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Splitter.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Splitter.java
index 7f3680eb5..e1bba0290 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/Splitter.java
@@ -23,31 +23,31 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.SplitNode;
-import jdk.nashorn.internal.ir.Splittable;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.SplitNode;
+import org.openjdk.nashorn.internal.ir.Splittable;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Split the IR into smaller compile units.
@@ -385,4 +385,3 @@ public boolean enterFunctionNode(final FunctionNode node) {
         return node == outermost;
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/TypeEvaluator.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/TypeEvaluator.java
index 96e334a49..b2cecf233 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/TypeEvaluator.java
@@ -23,30 +23,30 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.Property.NOT_CONFIGURABLE;
-import static jdk.nashorn.internal.runtime.Property.NOT_ENUMERABLE;
-import static jdk.nashorn.internal.runtime.Property.NOT_WRITABLE;
+import static org.openjdk.nashorn.internal.runtime.Property.NOT_CONFIGURABLE;
+import static org.openjdk.nashorn.internal.runtime.Property.NOT_ENUMERABLE;
+import static org.openjdk.nashorn.internal.runtime.Property.NOT_WRITABLE;
 
 import java.lang.invoke.MethodType;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.Optimistic;
-import jdk.nashorn.internal.objects.ArrayBufferView;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.runtime.FindProperty;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.Optimistic;
+import org.openjdk.nashorn.internal.objects.ArrayBufferView;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.runtime.FindProperty;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Functionality for using a runtime scope to look up value types.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/TypeMap.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/TypeMap.java
index 729d9c105..e773d8499 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/TypeMap.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.lang.invoke.MethodType;
 import java.util.Arrays;
 import java.util.NoSuchElementException;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
 
 /**
  * A tuple containing function id, parameter types, return type and needsCallee flag.
@@ -93,7 +93,7 @@ MethodType getCallSiteType(final FunctionNode functionNode) {
 
     /**
      * Does the function using this TypeMap need a callee argument. This is used
-     * to compute correct param index offsets in {@link jdk.nashorn.internal.codegen.ApplySpecialization}
+     * to compute correct param index offsets in {@link org.openjdk.nashorn.internal.codegen.ApplySpecialization}
      * @return true if a callee is needed, false otherwise
      */
     public boolean needsCallee() {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/WeighNodes.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/WeighNodes.java
index a2a6713dd..addb227ee 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/WeighNodes.java
@@ -23,42 +23,42 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen;
+package org.openjdk.nashorn.internal.codegen;
 
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JumpToInlinedFinally;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.SplitNode;
-import jdk.nashorn.internal.ir.Splittable;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JumpToInlinedFinally;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.SplitNode;
+import org.openjdk.nashorn.internal.ir.Splittable;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
 
 
 /**
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/anchor.properties b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/anchor.properties
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/anchor.properties
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/anchor.properties
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/ArrayType.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/ArrayType.java
index 442e3955f..5b23f9f72 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/ArrayType.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.AALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.AASTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.ANEWARRAY;
-import static jdk.internal.org.objectweb.asm.Opcodes.ARRAYLENGTH;
+import static org.objectweb.asm.Opcodes.AALOAD;
+import static org.objectweb.asm.Opcodes.AASTORE;
+import static org.objectweb.asm.Opcodes.ALOAD;
+import static org.objectweb.asm.Opcodes.ANEWARRAY;
+import static org.objectweb.asm.Opcodes.ARRAYLENGTH;
 
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
 
 /**
  * This is an array type, i.e. OBJECT_ARRAY, NUMBER_ARRAY.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BitwiseType.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BitwiseType.java
index 45fa52767..dcf125097 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BitwiseType.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
 /**
  * This class represents a numeric type that can be used for bit operations.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BooleanType.java
similarity index 84%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BooleanType.java
index 1dcd8e8a5..df35cb69a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BooleanType.java
@@ -23,20 +23,20 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.I2D;
-import static jdk.internal.org.objectweb.asm.Opcodes.I2L;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1;
-import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN;
-import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.runtime.JSType.UNDEFINED_INT;
-
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.CompilerConstants;
+package org.openjdk.nashorn.internal.codegen.types;
+
+import static org.objectweb.asm.Opcodes.I2D;
+import static org.objectweb.asm.Opcodes.I2L;
+import static org.objectweb.asm.Opcodes.ICONST_0;
+import static org.objectweb.asm.Opcodes.ICONST_1;
+import static org.objectweb.asm.Opcodes.ILOAD;
+import static org.objectweb.asm.Opcodes.IRETURN;
+import static org.objectweb.asm.Opcodes.ISTORE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.JSType.UNDEFINED_INT;
+
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
 
 /**
  * The boolean type class
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
index d38cec318..b824ce612 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
 
 /**
  * Array operations, not supported by all ops
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
index ca3e1d3f0..dbb937e7a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
 
 /**
  * Bitwise operations not supported by all types
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
index 91209c264..5c41ec201 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
 
 /**
  * Numeric operations, not supported by all types
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeOps.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeOps.java
index 31e4bb620..c292f9681 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/BytecodeOps.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
-import jdk.internal.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.MethodVisitor;
 
 
 /**
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/IntType.java
similarity index 79%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/IntType.java
index c5ee415d4..8e084c95c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/IntType.java
@@ -23,39 +23,39 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.BIPUSH;
-import static jdk.internal.org.objectweb.asm.Opcodes.I2D;
-import static jdk.internal.org.objectweb.asm.Opcodes.I2L;
-import static jdk.internal.org.objectweb.asm.Opcodes.IADD;
-import static jdk.internal.org.objectweb.asm.Opcodes.IAND;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_2;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_3;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_4;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_5;
-import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_M1;
-import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.IMUL;
-import static jdk.internal.org.objectweb.asm.Opcodes.INEG;
-import static jdk.internal.org.objectweb.asm.Opcodes.IOR;
-import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN;
-import static jdk.internal.org.objectweb.asm.Opcodes.ISHL;
-import static jdk.internal.org.objectweb.asm.Opcodes.ISHR;
-import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.ISUB;
-import static jdk.internal.org.objectweb.asm.Opcodes.IUSHR;
-import static jdk.internal.org.objectweb.asm.Opcodes.IXOR;
-import static jdk.internal.org.objectweb.asm.Opcodes.SIPUSH;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.runtime.JSType.UNDEFINED_INT;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.runtime.JSType;
+package org.openjdk.nashorn.internal.codegen.types;
+
+import static org.objectweb.asm.Opcodes.BIPUSH;
+import static org.objectweb.asm.Opcodes.I2D;
+import static org.objectweb.asm.Opcodes.I2L;
+import static org.objectweb.asm.Opcodes.IADD;
+import static org.objectweb.asm.Opcodes.IAND;
+import static org.objectweb.asm.Opcodes.ICONST_0;
+import static org.objectweb.asm.Opcodes.ICONST_1;
+import static org.objectweb.asm.Opcodes.ICONST_2;
+import static org.objectweb.asm.Opcodes.ICONST_3;
+import static org.objectweb.asm.Opcodes.ICONST_4;
+import static org.objectweb.asm.Opcodes.ICONST_5;
+import static org.objectweb.asm.Opcodes.ICONST_M1;
+import static org.objectweb.asm.Opcodes.ILOAD;
+import static org.objectweb.asm.Opcodes.IMUL;
+import static org.objectweb.asm.Opcodes.INEG;
+import static org.objectweb.asm.Opcodes.IOR;
+import static org.objectweb.asm.Opcodes.IRETURN;
+import static org.objectweb.asm.Opcodes.ISHL;
+import static org.objectweb.asm.Opcodes.ISHR;
+import static org.objectweb.asm.Opcodes.ISTORE;
+import static org.objectweb.asm.Opcodes.ISUB;
+import static org.objectweb.asm.Opcodes.IUSHR;
+import static org.objectweb.asm.Opcodes.IXOR;
+import static org.objectweb.asm.Opcodes.SIPUSH;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.JSType.UNDEFINED_INT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 /**
  * Type class: INT
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/LongType.java
similarity index 82%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/LongType.java
index 7a19d3bbe..e17ab848a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/LongType.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.L2D;
-import static jdk.internal.org.objectweb.asm.Opcodes.L2I;
-import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_0;
-import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_1;
-import static jdk.internal.org.objectweb.asm.Opcodes.LLOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.LRETURN;
-import static jdk.internal.org.objectweb.asm.Opcodes.LSTORE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.runtime.JSType.UNDEFINED_LONG;
-
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.runtime.JSType;
+package org.openjdk.nashorn.internal.codegen.types;
+
+import static org.objectweb.asm.Opcodes.L2D;
+import static org.objectweb.asm.Opcodes.L2I;
+import static org.objectweb.asm.Opcodes.LCONST_0;
+import static org.objectweb.asm.Opcodes.LCONST_1;
+import static org.objectweb.asm.Opcodes.LLOAD;
+import static org.objectweb.asm.Opcodes.LRETURN;
+import static org.objectweb.asm.Opcodes.LSTORE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.JSType.UNDEFINED_LONG;
+
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 /**
  * Type class: LONG
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/NumberType.java
similarity index 80%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/NumberType.java
index 924880b18..5d11a44b1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/NumberType.java
@@ -23,27 +23,27 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.DADD;
-import static jdk.internal.org.objectweb.asm.Opcodes.DCMPG;
-import static jdk.internal.org.objectweb.asm.Opcodes.DCMPL;
-import static jdk.internal.org.objectweb.asm.Opcodes.DCONST_0;
-import static jdk.internal.org.objectweb.asm.Opcodes.DCONST_1;
-import static jdk.internal.org.objectweb.asm.Opcodes.DDIV;
-import static jdk.internal.org.objectweb.asm.Opcodes.DLOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.DMUL;
-import static jdk.internal.org.objectweb.asm.Opcodes.DNEG;
-import static jdk.internal.org.objectweb.asm.Opcodes.DREM;
-import static jdk.internal.org.objectweb.asm.Opcodes.DRETURN;
-import static jdk.internal.org.objectweb.asm.Opcodes.DSTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.DSUB;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.runtime.JSType.UNDEFINED_DOUBLE;
-
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.runtime.JSType;
+package org.openjdk.nashorn.internal.codegen.types;
+
+import static org.objectweb.asm.Opcodes.DADD;
+import static org.objectweb.asm.Opcodes.DCMPG;
+import static org.objectweb.asm.Opcodes.DCMPL;
+import static org.objectweb.asm.Opcodes.DCONST_0;
+import static org.objectweb.asm.Opcodes.DCONST_1;
+import static org.objectweb.asm.Opcodes.DDIV;
+import static org.objectweb.asm.Opcodes.DLOAD;
+import static org.objectweb.asm.Opcodes.DMUL;
+import static org.objectweb.asm.Opcodes.DNEG;
+import static org.objectweb.asm.Opcodes.DREM;
+import static org.objectweb.asm.Opcodes.DRETURN;
+import static org.objectweb.asm.Opcodes.DSTORE;
+import static org.objectweb.asm.Opcodes.DSUB;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.JSType.UNDEFINED_DOUBLE;
+
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 class NumberType extends NumericType {
     private static final long serialVersionUID = 1L;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/NumericType.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/NumericType.java
index d536cc7d1..e112be41b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/NumericType.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
 /**
  * This is a numeric type, i.e. NUMBER, LONG, INT, INT32.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/ObjectType.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/ObjectType.java
index 1538489e9..9804366c3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/ObjectType.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
+package org.openjdk.nashorn.internal.codegen.types;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL;
-import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN;
-import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.CHECKCAST;
-import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
-import static jdk.nashorn.internal.codegen.CompilerConstants.className;
-import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+import static org.objectweb.asm.Opcodes.ACONST_NULL;
+import static org.objectweb.asm.Opcodes.ALOAD;
+import static org.objectweb.asm.Opcodes.ARETURN;
+import static org.objectweb.asm.Opcodes.ASTORE;
+import static org.objectweb.asm.Opcodes.CHECKCAST;
+import static org.objectweb.asm.Opcodes.GETSTATIC;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.className;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
 
 import java.lang.invoke.MethodHandle;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
 /**
  * Type class: OBJECT This is the object type, used for all object types. It can
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/Type.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/Type.java
index fe8ab811f..efc64cf7b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/types/Type.java
@@ -23,28 +23,28 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.types;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.DALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.DASTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP2;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP2_X1;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP2_X2;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP_X1;
-import static jdk.internal.org.objectweb.asm.Opcodes.DUP_X2;
-import static jdk.internal.org.objectweb.asm.Opcodes.IALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.IASTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.LALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.LASTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.NEWARRAY;
-import static jdk.internal.org.objectweb.asm.Opcodes.POP;
-import static jdk.internal.org.objectweb.asm.Opcodes.POP2;
-import static jdk.internal.org.objectweb.asm.Opcodes.SWAP;
-import static jdk.internal.org.objectweb.asm.Opcodes.T_DOUBLE;
-import static jdk.internal.org.objectweb.asm.Opcodes.T_INT;
-import static jdk.internal.org.objectweb.asm.Opcodes.T_LONG;
+package org.openjdk.nashorn.internal.codegen.types;
+
+import static org.objectweb.asm.Opcodes.DALOAD;
+import static org.objectweb.asm.Opcodes.DASTORE;
+import static org.objectweb.asm.Opcodes.DUP;
+import static org.objectweb.asm.Opcodes.DUP2;
+import static org.objectweb.asm.Opcodes.DUP2_X1;
+import static org.objectweb.asm.Opcodes.DUP2_X2;
+import static org.objectweb.asm.Opcodes.DUP_X1;
+import static org.objectweb.asm.Opcodes.DUP_X2;
+import static org.objectweb.asm.Opcodes.IALOAD;
+import static org.objectweb.asm.Opcodes.IASTORE;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.LALOAD;
+import static org.objectweb.asm.Opcodes.LASTORE;
+import static org.objectweb.asm.Opcodes.NEWARRAY;
+import static org.objectweb.asm.Opcodes.POP;
+import static org.objectweb.asm.Opcodes.POP2;
+import static org.objectweb.asm.Opcodes.SWAP;
+import static org.objectweb.asm.Opcodes.T_DOUBLE;
+import static org.objectweb.asm.Opcodes.T_INT;
+import static org.objectweb.asm.Opcodes.T_LONG;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -56,11 +56,11 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.objectweb.asm.MethodVisitor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
 /**
  * This is the representation of a JavaScript type, disassociated from java
@@ -105,11 +105,11 @@ public abstract class Type implements Comparable, BytecodeOps, Serializabl
      * Cache for internal types - this is a query that requires complex stringbuilding inside
      * ASM and it saves startup time to cache the type mappings
      */
-    private static final Map, jdk.internal.org.objectweb.asm.Type> INTERNAL_TYPE_CACHE =
-            Collections.synchronizedMap(new WeakHashMap, jdk.internal.org.objectweb.asm.Type>());
+    private static final Map, org.objectweb.asm.Type> INTERNAL_TYPE_CACHE =
+            Collections.synchronizedMap(new WeakHashMap, org.objectweb.asm.Type>());
 
     /** Internal ASM type for this Type - computed once at construction */
-    private transient final jdk.internal.org.objectweb.asm.Type internalType;
+    private transient final org.objectweb.asm.Type internalType;
 
     /** Weights are used to decide which types are "wider" than other types */
     protected static final int MIN_WEIGHT = -1;
@@ -127,7 +127,7 @@ public abstract class Type implements Comparable, BytecodeOps, Serializabl
     Type(final String name, final Class clazz, final int weight, final int slots) {
         this.name         = name;
         this.clazz        = clazz;
-        this.descriptor   = jdk.internal.org.objectweb.asm.Type.getDescriptor(clazz);
+        this.descriptor   = org.objectweb.asm.Type.getDescriptor(clazz);
         this.weight       = weight;
         assert weight >= MIN_WEIGHT && weight <= MAX_WEIGHT : "illegal type weight: " + weight;
         this.slots        = slots;
@@ -189,11 +189,11 @@ public Class getBoxedType() {
      * @return a descriptor string
      */
     public static String getMethodDescriptor(final Type returnType, final Type... types) {
-        final jdk.internal.org.objectweb.asm.Type[] itypes = new jdk.internal.org.objectweb.asm.Type[types.length];
+        final org.objectweb.asm.Type[] itypes = new org.objectweb.asm.Type[types.length];
         for (int i = 0; i < types.length; i++) {
             itypes[i] = types[i].getInternalType();
         }
-        return jdk.internal.org.objectweb.asm.Type.getMethodDescriptor(returnType.getInternalType(), itypes);
+        return org.objectweb.asm.Type.getMethodDescriptor(returnType.getInternalType(), itypes);
     }
 
     /**
@@ -205,11 +205,11 @@ public static String getMethodDescriptor(final Type returnType, final Type... ty
      * @return a descriptor string
      */
     public static String getMethodDescriptor(final Class returnType, final Class... types) {
-        final jdk.internal.org.objectweb.asm.Type[] itypes = new jdk.internal.org.objectweb.asm.Type[types.length];
+        final org.objectweb.asm.Type[] itypes = new org.objectweb.asm.Type[types.length];
         for (int i = 0; i < types.length; i++) {
             itypes[i] = getInternalType(types[i]);
         }
-        return jdk.internal.org.objectweb.asm.Type.getMethodDescriptor(getInternalType(returnType), itypes);
+        return org.objectweb.asm.Type.getMethodDescriptor(getInternalType(returnType), itypes);
     }
 
     /**
@@ -234,17 +234,17 @@ public static char getShortSignatureDescriptor(final Type type) {
      * @return Nashorn type
      */
     @SuppressWarnings("fallthrough")
-    private static Type typeFor(final jdk.internal.org.objectweb.asm.Type itype) {
+    private static Type typeFor(final org.objectweb.asm.Type itype) {
         switch (itype.getSort()) {
-        case jdk.internal.org.objectweb.asm.Type.BOOLEAN:
+        case org.objectweb.asm.Type.BOOLEAN:
             return BOOLEAN;
-        case jdk.internal.org.objectweb.asm.Type.INT:
+        case org.objectweb.asm.Type.INT:
             return INT;
-        case jdk.internal.org.objectweb.asm.Type.LONG:
+        case org.objectweb.asm.Type.LONG:
             return LONG;
-        case jdk.internal.org.objectweb.asm.Type.DOUBLE:
+        case org.objectweb.asm.Type.DOUBLE:
             return NUMBER;
-        case jdk.internal.org.objectweb.asm.Type.OBJECT:
+        case org.objectweb.asm.Type.OBJECT:
             if (Context.isStructureClass(itype.getClassName())) {
                 return SCRIPT_OBJECT;
             }
@@ -255,19 +255,19 @@ private static Type typeFor(final jdk.internal.org.objectweb.asm.Type itype) {
                     throw new AssertionError(e);
                 }
             });
-        case jdk.internal.org.objectweb.asm.Type.VOID:
+        case org.objectweb.asm.Type.VOID:
             return null;
-        case jdk.internal.org.objectweb.asm.Type.ARRAY:
+        case org.objectweb.asm.Type.ARRAY:
             switch (itype.getElementType().getSort()) {
-            case jdk.internal.org.objectweb.asm.Type.DOUBLE:
+            case org.objectweb.asm.Type.DOUBLE:
                 return NUMBER_ARRAY;
-            case jdk.internal.org.objectweb.asm.Type.INT:
+            case org.objectweb.asm.Type.INT:
                 return INT_ARRAY;
-            case jdk.internal.org.objectweb.asm.Type.LONG:
+            case org.objectweb.asm.Type.LONG:
                 return LONG_ARRAY;
             default:
                 assert false;
-            case jdk.internal.org.objectweb.asm.Type.OBJECT:
+            case org.objectweb.asm.Type.OBJECT:
                 return OBJECT_ARRAY;
             }
 
@@ -285,7 +285,7 @@ private static Type typeFor(final jdk.internal.org.objectweb.asm.Type itype) {
      * @return return type
      */
     public static Type getMethodReturnType(final String methodDescriptor) {
-        return Type.typeFor(jdk.internal.org.objectweb.asm.Type.getReturnType(methodDescriptor));
+        return Type.typeFor(org.objectweb.asm.Type.getReturnType(methodDescriptor));
     }
 
     /**
@@ -295,7 +295,7 @@ public static Type getMethodReturnType(final String methodDescriptor) {
      * @return parameter type array
      */
     public static Type[] getMethodArguments(final String methodDescriptor) {
-        final jdk.internal.org.objectweb.asm.Type itypes[] = jdk.internal.org.objectweb.asm.Type.getArgumentTypes(methodDescriptor);
+        final org.objectweb.asm.Type itypes[] = org.objectweb.asm.Type.getArgumentTypes(methodDescriptor);
         final Type types[] = new Type[itypes.length];
         for (int i = 0; i < itypes.length; i++) {
             types[i] = Type.typeFor(itypes[i]);
@@ -361,26 +361,26 @@ public static Map readTypeMap(final DataInput input) throws IOExc
         return map;
     }
 
-    static jdk.internal.org.objectweb.asm.Type getInternalType(final String className) {
-        return jdk.internal.org.objectweb.asm.Type.getType(className);
+    static org.objectweb.asm.Type getInternalType(final String className) {
+        return org.objectweb.asm.Type.getType(className);
     }
 
-    private jdk.internal.org.objectweb.asm.Type getInternalType() {
+    private org.objectweb.asm.Type getInternalType() {
         return internalType;
     }
 
-    private static jdk.internal.org.objectweb.asm.Type lookupInternalType(final Class type) {
-        final Map, jdk.internal.org.objectweb.asm.Type> c = INTERNAL_TYPE_CACHE;
-        jdk.internal.org.objectweb.asm.Type itype = c.get(type);
+    private static org.objectweb.asm.Type lookupInternalType(final Class type) {
+        final Map, org.objectweb.asm.Type> c = INTERNAL_TYPE_CACHE;
+        org.objectweb.asm.Type itype = c.get(type);
         if (itype != null) {
             return itype;
         }
-        itype = jdk.internal.org.objectweb.asm.Type.getType(type);
+        itype = org.objectweb.asm.Type.getType(type);
         c.put(type, itype);
         return itype;
     }
 
-    private static jdk.internal.org.objectweb.asm.Type getInternalType(final Class type) {
+    private static org.objectweb.asm.Type getInternalType(final Class type) {
         return lookupInternalType(type);
     }
 
@@ -393,7 +393,7 @@ static void invokestatic(final MethodVisitor method, final Call call) {
      * @return the internal name
      */
     public String getInternalName() {
-        return jdk.internal.org.objectweb.asm.Type.getInternalName(getTypeClass());
+        return org.objectweb.asm.Type.getInternalName(getTypeClass());
     }
 
     /**
@@ -402,7 +402,7 @@ public String getInternalName() {
      * @return the internal name
      */
     public static String getInternalName(final Class clazz) {
-        return jdk.internal.org.objectweb.asm.Type.getInternalName(clazz);
+        return org.objectweb.asm.Type.getInternalName(clazz);
     }
 
     /**
@@ -912,7 +912,7 @@ private static void swap(final MethodVisitor method, final Type above, final Typ
 
     /**
      * This is the CharSequence singleton used to represent JS strings internally
-     * (either a {@code java.lang.String} or {@code jdk.nashorn.internal.runtime.ConsString}.
+     * (either a {@code java.lang.String} or {@code org.openjdk.nashorn.internal.runtime.ConsString}.
      */
     public static final Type CHARSEQUENCE = putInCache(new ObjectType(CharSequence.class));
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/AccessNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/AccessNode.java
index d490bbbfc..4a34f0e08 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/AccessNode.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of a property access (period operator.)
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Assignment.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Assignment.java
index 093b0d80a..1a07f5f29 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Assignment.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 /**
  * Can a node be an assignment under certain circumstances?
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BaseNode.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BaseNode.java
index 85ded3e92..d0b3f313e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BaseNode.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * IR base for accessing/indexing nodes.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BinaryNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BinaryNode.java
index 4c8a6abae..efeab74a1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BinaryNode.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * BinaryNode nodes represent two operand operations.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Block.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Block.java
index 522b4c56b..b1b83c43b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Block.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -33,9 +33,9 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for a list of statements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BlockLexicalContext.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BlockLexicalContext.java
index 1848d2ace..db5c2b715 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BlockLexicalContext.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BlockStatement.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BlockStatement.java
index 8f077e8d2..711b29635 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BlockStatement.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.List;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * Represents a block used as a statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakNode.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakNode.java
index 3e80bccd3..b74013329 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakNode.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for {@code break} statements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakableNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakableNode.java
index 160a1f63f..0bcceae50 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakableNode.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.codegen.Label;
 
 /**
  * This class represents a node from which control flow can execute
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakableStatement.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakableStatement.java
index 7e1afaf0a..1bd7d790b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/BreakableStatement.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
 
 @Immutable
 abstract class BreakableStatement extends LexicalContextStatement implements BreakableNode {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CallNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CallNode.java
index 95a116652..7c65da788 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CallNode.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for a function call.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CaseNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CaseNode.java
index 48f961845..cf22efac4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CaseNode.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of CASE clause.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CatchNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CatchNode.java
index 9431f3b3a..5ea9a4366 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CatchNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of a catch clause.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ClassNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ClassNode.java
index 4b06d223a..7fbc8f86b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ClassNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ClassNode.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Collections;
 import java.util.List;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for class definitions.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CompileUnitHolder.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CompileUnitHolder.java
index 27d69d53f..c582f3223 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CompileUnitHolder.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/CompileUnitHolder.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.CompileUnit;
+import org.openjdk.nashorn.internal.codegen.CompileUnit;
 
 /**
  * Marker interface for things in the IR that can hold compile units.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ContinueNode.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ContinueNode.java
index eb67f4126..f5f8c2e7b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ContinueNode.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for CONTINUE statements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/DebuggerNode.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/DebuggerNode.java
index 70df83897..4529f2828 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/DebuggerNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/DebuggerNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for a debugger statement.
@@ -60,4 +60,3 @@ public void toString(final StringBuilder sb, final boolean printType) {
         sb.append("debugger");
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/EmptyNode.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/EmptyNode.java
index 2c9d976dc..582d9db06 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/EmptyNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for an empty statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ErrorNode.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ErrorNode.java
index c8ba0e806..57790e94d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ErrorNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ErrorNode.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for an error expression.
@@ -65,4 +65,3 @@ public void toString(final StringBuilder sb, final boolean printType) {
         sb.append("");
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Expression.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Expression.java
index e62eb732d..330edfd25 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Expression.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 
 /**
  * Common superclass for all expression nodes. Expression nodes can have
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ExpressionList.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ExpressionList.java
index 16fd147b8..b08f4d4df 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionList.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ExpressionList.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Collections;
 import java.util.List;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR for CoverParenthesizedExpressionAndArrowParameterList, used only during parsing.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ExpressionStatement.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ExpressionStatement.java
index 21618ab86..76c503261 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ExpressionStatement.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * IR representation for executing bare expressions. Basically, an expression
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Flags.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Flags.java
index fb4b5de9b..c1dfc202d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Flags.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 /**
  * Interface implemented by all nodes that have flags in
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ForNode.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ForNode.java
index df104340a..75cd7814f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ForNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representing a FOR statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/FunctionCall.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/FunctionCall.java
index 98533bcad..3783d85e5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/FunctionCall.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Interface used by AccessNodes, IndexNodes and IdentNodes to signal that when evaluated, their value will be treated
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/FunctionNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/FunctionNode.java
index ce0d661d9..4bf9c824a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/FunctionNode.java
@@ -23,33 +23,33 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROFILE;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_ENTEREXIT;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_VALUES;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROFILE;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_ENTEREXIT;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_TRACE_VALUES;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.internal.codegen.CompileUnit;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.UserAccessorProperty;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.openjdk.nashorn.internal.codegen.CompileUnit;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.Namespace;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.UserAccessorProperty;
+import org.openjdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
 /**
  * IR representation for function (or script.)
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/GetSplitState.java
similarity index 87%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/GetSplitState.java
index 6e360291a..3901bd5f9 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/GetSplitState.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.runtime.Scope;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.runtime.Scope;
 
 /**
  * Synthetic AST node that represents loading of the scope object and invocation of the {@link Scope#getSplitState()}
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IdentNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IdentNode.java
index 216fda09e..577eb7b8f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IdentNode.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
-
-import static jdk.nashorn.internal.codegen.CompilerConstants.__DIR__;
-import static jdk.nashorn.internal.codegen.CompilerConstants.__FILE__;
-import static jdk.nashorn.internal.codegen.CompilerConstants.__LINE__;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
+package org.openjdk.nashorn.internal.ir;
+
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.__DIR__;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.__FILE__;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.__LINE__;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * IR representation for an identifier.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IfNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IfNode.java
index cdebaad91..cf241faa4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IfNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for an IF statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IndexNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IndexNode.java
index 73e220d69..59326493b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/IndexNode.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 /**
  * IR representation of an indexed access (brackets operator.)
  */
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JoinPredecessor.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JoinPredecessor.java
index e55aec092..ce77d1b3e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JoinPredecessor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 /**
  * Interface implemented by AST nodes that either can occur as predecessors of a control flow join, or contain a control
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JoinPredecessorExpression.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JoinPredecessorExpression.java
index 7f0d990de..fb47002d8 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JoinPredecessorExpression.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * A wrapper for an expression that is in a position to be a join predecessor.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JumpStatement.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JumpStatement.java
index 628bc772d..fa7fc3071 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JumpStatement.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.codegen.Label;
 
 /**
  * Common base class for jump statements (e.g. {@code break} and {@code continue}).
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JumpToInlinedFinally.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JumpToInlinedFinally.java
index bba0d99e0..eec1a02c6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpToInlinedFinally.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/JumpToInlinedFinally.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Objects;
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for synthetic jump into an inlined finally statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LabelNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LabelNode.java
index 744ba54b9..a6da70f16 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LabelNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for a labeled statement. It implements JoinPredecessor to hold conversions that need to be effected
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Labels.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Labels.java
index ce5e9dc4f..475219d4d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Labels.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.List;
-import jdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.codegen.Label;
 
 /**
  * Interface that can be used to get a list of all labels in a node
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContext.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContext.java
index 527a1bb32..702545c00 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContext.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.io.File;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.Source;
 
 /**
  * A class that tracks the current lexical context of node visitation as a stack
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextExpression.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextExpression.java
index e9a88cc84..8df160b04 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextExpression.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 abstract class LexicalContextExpression extends Expression implements LexicalContextNode {
     private static final long serialVersionUID = 1L;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextNode.java
index 5054b014f..94e9330ab 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 
 /**
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextStatement.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextStatement.java
index 6a65fad27..e9f215c68 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LexicalContextStatement.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 abstract class LexicalContextStatement extends Statement implements LexicalContextNode {
     private static final long serialVersionUID = 1L;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LiteralNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LiteralNode.java
index ceedab098..fd3e4774c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LiteralNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.ArrayType;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.parser.Lexer.LexerToken;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.codegen.types.ArrayType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.parser.Lexer.LexerToken;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
 /**
  * Literal nodes represent JavaScript values.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LocalVariableConversion.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LocalVariableConversion.java
index b66a2fd9e..8049823f6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LocalVariableConversion.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.codegen.types.Type;
 
 /**
  * Class describing one or more local variable conversions that needs to be performed on entry to a control flow join
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LoopNode.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LoopNode.java
index bbc6d595c..43ff6f15c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/LoopNode.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.codegen.Label;
 
 /**
  * A loop node, for example a while node, do while node or for node
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Module.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Module.java
index 1745c974d..c6c344aa5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Module.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Module.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.List;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Node.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Node.java
index bd1045ca2..5ccdb8037 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Node.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * Nodes are used to compose Abstract Syntax Trees.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ObjectNode.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ObjectNode.java
index a38d6e2a6..6c0d4cae7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ObjectNode.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.RandomAccess;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of an object literal.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Optimistic.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Optimistic.java
index 8337d0879..8abf58a20 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Optimistic.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.codegen.types.Type;
 
 /**
  * Is this a node that can be optimistically typed? This means that it
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/OptimisticLexicalContext.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/OptimisticLexicalContext.java
index 18f68fe67..0a968cc03 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/OptimisticLexicalContext.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.codegen.types.Type;
 
 /**
  * Lexical context that keeps track of optimistic assumptions (if any)
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/PropertyKey.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/PropertyKey.java
index e4a72aa5c..937266d5c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/PropertyKey.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 /**
  * Any node that can be a property key inherits this
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/PropertyNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/PropertyNode.java
index 24eddf303..40c8c7967 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/PropertyNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of an object literal property.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ReturnNode.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ReturnNode.java
index 1491b834e..ca46f491f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ReturnNode.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.parser.TokenType.RETURN;
-import static jdk.nashorn.internal.parser.TokenType.YIELD;
+import static org.openjdk.nashorn.internal.parser.TokenType.RETURN;
+import static org.openjdk.nashorn.internal.parser.TokenType.YIELD;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for RETURN or YIELD statements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/RuntimeNode.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/RuntimeNode.java
index afc52bf3f..8e1b801ea 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/RuntimeNode.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * IR representation for a runtime call.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SetSplitState.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SetSplitState.java
index 33ca3d156..758a142ad 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SetSplitState.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SetSplitState.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.runtime.Scope;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.runtime.Scope;
 
 /**
  * Synthetic AST node that represents loading of the scope object and invocation of the {@link Scope#setSplitState(int)}
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SplitNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SplitNode.java
index 43b511d62..30fcc80c1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SplitNode.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
 import java.io.ObjectOutputStream;
-import jdk.nashorn.internal.codegen.CompileUnit;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.CompileUnit;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * Node indicating code is split across classes.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SplitReturn.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SplitReturn.java
index 9fed5ff23..1b83ba21b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SplitReturn.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * Synthetic AST node that represents return from a split fragment of a split function for control flow reasons (break
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Splittable.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Splittable.java
index d33117122..31513e96e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Splittable.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Splittable.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.io.Serializable;
 import java.util.List;
-import jdk.nashorn.internal.codegen.CompileUnit;
+import org.openjdk.nashorn.internal.codegen.CompileUnit;
 
 /**
  * An interface for splittable expressions.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Statement.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Statement.java
index f9a335c74..dbd6c1b56 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Statement.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 /**
  * Statement is something that becomes code and can be stepped past. A block is
@@ -106,4 +106,3 @@ public final boolean hasTerminalFlags() {
         return isTerminal() || hasGoto();
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SwitchNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SwitchNode.java
index 4f2515111..2fe996717 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/SwitchNode.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.Label;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.Label;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of a SWITCH statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Symbol.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Symbol.java
index d08352b7c..2e509a694 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Symbol.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -32,10 +32,10 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.StringTokenizer;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Symbol is a symbolic address for a value ("variable" if you wish). Identifiers in JavaScript source, as well as
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TemplateLiteral.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TemplateLiteral.java
index 9e5024408..caa6a6aff 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TemplateLiteral.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TemplateLiteral.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * Represents ES6 template string expression. Note that this Node class is used
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Terminal.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Terminal.java
index 3f5c25bc0..586ecfcc3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/Terminal.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 /**
  * Interface for AST nodes that can have a flag determining if they can terminate function control flow.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TernaryNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TernaryNode.java
index e3bca0b98..25a8b7648 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TernaryNode.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * TernaryNode represent the ternary operator {@code ?:}. Note that for control-flow calculation reasons its branch
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ThrowNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ThrowNode.java
index f422aea4e..019f6d499 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/ThrowNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for THROW statements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TryNode.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TryNode.java
index 661281e1a..c809b5841 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/TryNode.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation of a TRY statement.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/UnaryNode.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/UnaryNode.java
index 1eb07ed45..d72d14123 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/UnaryNode.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.parser.TokenType.BIT_NOT;
-import static jdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
-import static jdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.parser.TokenType.BIT_NOT;
+import static org.openjdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
+import static org.openjdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * UnaryNode nodes represent single operand operations.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/VarNode.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/VarNode.java
index 6de025581..f77343c6c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/VarNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * Node represents a var/let declaration.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/WhileNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/WhileNode.java
index e6304f4e9..9e03b9d1f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/WhileNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for a WHILE statement. This is the superclass of all
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/WithNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/WithNode.java
index 2e2be8875..3656db33e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/WithNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir;
+package org.openjdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Immutable;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.ir.annotations.Immutable;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 /**
  * IR representation for {@code with} statements.
@@ -131,4 +131,3 @@ public WithNode setExpression(final LexicalContext lc, final Expression expressi
         return Node.replaceInLexicalContext(lc, this, new WithNode(this, expression, body));
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Ignore.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Ignore.java
index 171eaccec..30ec35c40 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Ignore.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.annotations;
+package org.openjdk.nashorn.internal.ir.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
+import org.openjdk.nashorn.internal.ir.debug.ASTWriter;
 
 /**
  * This signifies a node that should be ignored in traversal, for example
@@ -35,7 +35,7 @@
  * has no actual IR representations, but yet reside in the node.
  *
  * @see ASTWriter
- * @see jdk.nashorn.internal.ir.Node
+ * @see org.openjdk.nashorn.internal.ir.Node
  */
 @Retention(value=RetentionPolicy.RUNTIME)
 public @interface Ignore {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Immutable.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Immutable.java
index 663abf7c3..e5aa12b23 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Immutable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.annotations;
+package org.openjdk.nashorn.internal.ir.annotations;
 
 /**
  * Tag for nodes that are immutable. To be immutable all fields must be
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Reference.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Reference.java
index 27f6a6976..8381607b2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/annotations/Reference.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.annotations;
+package org.openjdk.nashorn.internal.ir.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/ASTWriter.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/ASTWriter.java
index 93cede30f..58abf0517 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/ASTWriter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.debug;
+package org.openjdk.nashorn.internal.ir.debug;
 
 import java.lang.reflect.Field;
 import java.util.ArrayDeque;
@@ -33,20 +33,20 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.Terminal;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.Terminal;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.annotations.Ignore;
+import org.openjdk.nashorn.internal.ir.annotations.Reference;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
 
 /**
  * AST-as-text visualizer. Sometimes you want tree form and not source
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/JSONWriter.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/JSONWriter.java
index f8484f378..d6a23263a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -23,56 +23,56 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.debug;
+package org.openjdk.nashorn.internal.ir.debug;
 
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.DebuggerNode;
-import jdk.nashorn.internal.ir.EmptyNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.SplitNode;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.parser.JSONParser;
-import jdk.nashorn.internal.parser.Lexer.RegexToken;
-import jdk.nashorn.internal.parser.Parser;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.DebuggerNode;
+import org.openjdk.nashorn.internal.ir.EmptyNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.SplitNode;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.parser.JSONParser;
+import org.openjdk.nashorn.internal.parser.Lexer.RegexToken;
+import org.openjdk.nashorn.internal.parser.Parser;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.Source;
 
 /**
  * This IR writer produces a JSON string that represents AST as a JSON string.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/NashornClassReader.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/NashornClassReader.java
index b23724dfc..b5312c647 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/NashornClassReader.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.debug;
+package org.openjdk.nashorn.internal.ir.debug;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.nashorn.internal.ir.debug.NashornTextifier.NashornLabel;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Label;
+import org.openjdk.nashorn.internal.ir.debug.NashornTextifier.NashornLabel;
 
 /**
  * Subclass of the ASM class reader that retains more info, such
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/NashornTextifier.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/NashornTextifier.java
index 22797e839..dacff927f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/NashornTextifier.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.debug;
+package org.openjdk.nashorn.internal.ir.debug;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -36,18 +36,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import jdk.internal.org.objectweb.asm.Attribute;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.signature.SignatureReader;
-import jdk.internal.org.objectweb.asm.util.Printer;
-import jdk.internal.org.objectweb.asm.util.TraceSignatureVisitor;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.NameCodec;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.signature.SignatureReader;
+import org.objectweb.asm.util.Printer;
+import org.objectweb.asm.util.TraceSignatureVisitor;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.NameCodec;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Pretty printer for --print-code.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/PrintVisitor.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/PrintVisitor.java
index fccad1532..4ae15fdc8 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/debug/PrintVisitor.java
@@ -23,36 +23,36 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.debug;
+package org.openjdk.nashorn.internal.ir.debug;
 
 import java.util.List;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.JoinPredecessor;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LocalVariableConversion;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.SplitNode;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessor;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LocalVariableConversion;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.SplitNode;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
 
 /**
  * Print out the AST as human readable source code.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
index c61e22f73..abdcc4a96 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.visitor;
+package org.openjdk.nashorn.internal.ir.visitor;
 
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
 
 /**
  * Like NodeVisitor but navigating further into operators.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/NodeVisitor.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/NodeVisitor.java
index 2aba91fad..6ae0d6df7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/NodeVisitor.java
@@ -23,50 +23,50 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.visitor;
-
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ClassNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.DebuggerNode;
-import jdk.nashorn.internal.ir.EmptyNode;
-import jdk.nashorn.internal.ir.ErrorNode;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.GetSplitState;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.JumpToInlinedFinally;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.SetSplitState;
-import jdk.nashorn.internal.ir.SplitNode;
-import jdk.nashorn.internal.ir.SplitReturn;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.TemplateLiteral;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
+package org.openjdk.nashorn.internal.ir.visitor;
+
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ClassNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.DebuggerNode;
+import org.openjdk.nashorn.internal.ir.EmptyNode;
+import org.openjdk.nashorn.internal.ir.ErrorNode;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.GetSplitState;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.JumpToInlinedFinally;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.SetSplitState;
+import org.openjdk.nashorn.internal.ir.SplitNode;
+import org.openjdk.nashorn.internal.ir.SplitReturn;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.TemplateLiteral;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
 
 /**
  * Visitor used to navigate the IR.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java
index 015e1feba..0167bacae 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/ir/visitor/SimpleNodeVisitor.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.ir.visitor;
+package org.openjdk.nashorn.internal.ir.visitor;
 
-import jdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
 
 /**
  * Convenience base class for a {@link NodeVisitor} with a plain {@link LexicalContext}.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/Lookup.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/Lookup.java
index 408fbef75..2ed51ba50 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/Lookup.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.lookup;
+package org.openjdk.nashorn.internal.lookup;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * MethodHandle Lookup management for Nashorn.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/MethodHandleFactory.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/MethodHandleFactory.java
index 2dcc401b9..c8ead3a85 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/MethodHandleFactory.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.lookup;
+package org.openjdk.nashorn.internal.lookup;
 
-import static jdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -38,13 +38,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This class is abstraction for all method handle, switchpoint and method type
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/MethodHandleFunctionality.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/MethodHandleFunctionality.java
index beaa85c2c..6636ad8f9 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/lookup/MethodHandleFunctionality.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.lookup;
+package org.openjdk.nashorn.internal.lookup;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -348,4 +348,3 @@ public interface MethodHandleFunctionality {
     public MethodType type(Class returnType, Class... paramTypes);
 
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/AbstractIterator.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/AbstractIterator.java
index fad39a9fd..88871946b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AbstractIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/AbstractIterator.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import java.lang.invoke.MethodHandle;
 import java.util.function.Consumer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 /**
  * ECMA6 25.1.2 The %IteratorPrototype% Object
@@ -223,5 +223,3 @@ public static void iterate(final Object iterable, final Global global, final Con
 
     }
 }
-
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
index 0e8ed3502..f8b18a347 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.sameValue;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.sameValue;
 
 import java.util.Objects;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Accessor Property descriptor is used to represent attributes an object property
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/ArrayBufferView.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/ArrayBufferView.java
index fb1bc1b18..d4c3f86da 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/ArrayBufferView.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * ArrayBufferView, es6 class or TypedArray implementation
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/ArrayIterator.java
similarity index 87%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/ArrayIterator.java
index 1d600df27..135253ecc 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/ArrayIterator.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 @ScriptClass("ArrayIterator")
 public class ArrayIterator extends AbstractIterator {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/DataPropertyDescriptor.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/DataPropertyDescriptor.java
index 24722930e..dd17e54d8 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/DataPropertyDescriptor.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.sameValue;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.sameValue;
 
 import java.util.Objects;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Data Property descriptor is used to represent attributes an object property
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/GenericPropertyDescriptor.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/GenericPropertyDescriptor.java
index 39d0b3ec7..63699ad14 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/GenericPropertyDescriptor.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import java.util.Objects;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Generic Property descriptor is used to represent attributes an object property
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/Global.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/Global.java
index 75558cb90..ad792ea82 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/Global.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.isString;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -50,39 +50,39 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Setter;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.FindProperty;
-import jdk.nashorn.internal.runtime.GlobalConstants;
-import jdk.nashorn.internal.runtime.GlobalFunctions;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.NativeJavaPackage;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.Scope;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.ScriptingFunctions;
-import jdk.nashorn.internal.runtime.Specialization;
-import jdk.nashorn.internal.runtime.Symbol;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.regexp.RegExpResult;
-import jdk.nashorn.internal.scripts.JD;
-import jdk.nashorn.internal.scripts.JO;
-import jdk.nashorn.tools.ShellFunctions;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Setter;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.FindProperty;
+import org.openjdk.nashorn.internal.runtime.GlobalConstants;
+import org.openjdk.nashorn.internal.runtime.GlobalFunctions;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.NativeJavaPackage;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.Scope;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.ScriptingFunctions;
+import org.openjdk.nashorn.internal.runtime.Specialization;
+import org.openjdk.nashorn.internal.runtime.Symbol;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpResult;
+import org.openjdk.nashorn.internal.scripts.JD;
+import org.openjdk.nashorn.internal.scripts.JO;
+import org.openjdk.nashorn.tools.ShellFunctions;
 
 /**
  * Representation of global scope.
@@ -94,7 +94,7 @@ public final class Global extends Scope {
     // This serves as placeholder value used in place of a location property (__FILE__, __DIR__, __LINE__)
     private static final Object LOCATION_PLACEHOLDER = new Object();
 
-    private static final String PACKAGE_PREFIX = "jdk.nashorn.internal.objects.";
+    private static final String PACKAGE_PREFIX = "org.openjdk.nashorn.internal.objects.";
 
     private InvokeByName TO_STRING;
     private InvokeByName VALUE_OF;
@@ -2404,7 +2404,7 @@ public final ScriptObject getLexicalScope() {
     }
 
     @Override
-    public void addBoundProperties(final ScriptObject source, final jdk.nashorn.internal.runtime.Property[] properties) {
+    public void addBoundProperties(final ScriptObject source, final org.openjdk.nashorn.internal.runtime.Property[] properties) {
         PropertyMap ownMap = getMap();
         LexicalScope lexScope = null;
         PropertyMap lexicalMap = null;
@@ -2414,16 +2414,16 @@ public void addBoundProperties(final ScriptObject source, final jdk.nashorn.inte
             lexScope = (LexicalScope) getLexicalScope();
             lexicalMap = lexScope.getMap();
 
-            for (final jdk.nashorn.internal.runtime.Property property : properties) {
+            for (final org.openjdk.nashorn.internal.runtime.Property property : properties) {
                 if (property.isLexicalBinding()) {
                     hasLexicalDefinitions = true;
                 }
                 // ES6 15.1.8 steps 6. and 7.
-                final jdk.nashorn.internal.runtime.Property globalProperty = ownMap.findProperty(property.getKey());
+                final org.openjdk.nashorn.internal.runtime.Property globalProperty = ownMap.findProperty(property.getKey());
                 if (globalProperty != null && !globalProperty.isConfigurable() && property.isLexicalBinding()) {
                     throw ECMAErrors.syntaxError("redeclare.variable", property.getKey().toString());
                 }
-                final jdk.nashorn.internal.runtime.Property lexicalProperty = lexicalMap.findProperty(property.getKey());
+                final org.openjdk.nashorn.internal.runtime.Property lexicalProperty = lexicalMap.findProperty(property.getKey());
                 if (lexicalProperty != null && !property.isConfigurable()) {
                     throw ECMAErrors.syntaxError("redeclare.variable", property.getKey().toString());
                 }
@@ -2431,7 +2431,7 @@ public void addBoundProperties(final ScriptObject source, final jdk.nashorn.inte
         }
 
         final boolean extensible = isExtensible();
-        for (final jdk.nashorn.internal.runtime.Property property : properties) {
+        for (final org.openjdk.nashorn.internal.runtime.Property property : properties) {
             if (property.isLexicalBinding()) {
                 assert lexScope != null;
                 lexicalMap = lexScope.addBoundProperty(lexicalMap, source, property, true);
@@ -2916,8 +2916,8 @@ private ScriptObject initPrototype(final String name, final ScriptObject prototy
         }
     }
 
-    private List extractBuiltinProperties(final String name, final ScriptObject func) {
-        final List list = new ArrayList<>();
+    private List extractBuiltinProperties(final String name, final ScriptObject func) {
+        final List list = new ArrayList<>();
 
         list.addAll(Arrays.asList(func.getMap().getProperties()));
 
@@ -2928,7 +2928,7 @@ private List extractBuiltinProperties(fin
             }
         }
 
-        final jdk.nashorn.internal.runtime.Property prop = getProperty(name);
+        final org.openjdk.nashorn.internal.runtime.Property prop = getProperty(name);
         if (prop != null) {
             list.add(prop);
         }
@@ -2950,7 +2950,7 @@ private void tagBuiltinProperties(final String name, final ScriptObject func) {
 
         //get all builtin properties in this builtin object and register switchpoints keyed on the propery name,
         //one overwrite destroys all for now, e.g. Function.prototype.apply = 17; also destroys Function.prototype.call etc
-        for (final jdk.nashorn.internal.runtime.Property prop : extractBuiltinProperties(name, func)) {
+        for (final org.openjdk.nashorn.internal.runtime.Property prop : extractBuiltinProperties(name, func)) {
             prop.setBuiltinSwitchPoint(sp);
         }
     }
@@ -2997,8 +2997,8 @@ private void initFunctionAndObject() {
         // Function valued properties of Function.prototype were not properly
         // initialized. Because, these were created before global.function and
         // global.object were not initialized.
-        jdk.nashorn.internal.runtime.Property[] properties = getFunctionPrototype().getMap().getProperties();
-        for (final jdk.nashorn.internal.runtime.Property property : properties) {
+        org.openjdk.nashorn.internal.runtime.Property[] properties = getFunctionPrototype().getMap().getProperties();
+        for (final org.openjdk.nashorn.internal.runtime.Property property : properties) {
             final Object key = property.getKey();
             final Object value = builtinFunction.get(key);
 
@@ -3014,7 +3014,7 @@ private void initFunctionAndObject() {
 
         // For function valued properties of Object and Object.prototype, make
         // sure prototype's proto chain ends with Object.prototype
-        for (final jdk.nashorn.internal.runtime.Property property : builtinObject.getMap().getProperties()) {
+        for (final org.openjdk.nashorn.internal.runtime.Property property : builtinObject.getMap().getProperties()) {
             final Object key = property.getKey();
             final Object value = builtinObject.get(key);
 
@@ -3029,7 +3029,7 @@ private void initFunctionAndObject() {
 
         properties = getObjectPrototype().getMap().getProperties();
 
-        for (final jdk.nashorn.internal.runtime.Property property : properties) {
+        for (final org.openjdk.nashorn.internal.runtime.Property property : properties) {
             final Object key   = property.getKey();
             if (key.equals("constructor")) {
                 continue;
@@ -3088,7 +3088,7 @@ protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final L
         }
 
         @Override
-        protected PropertyMap addBoundProperty(final PropertyMap propMap, final ScriptObject source, final jdk.nashorn.internal.runtime.Property property, final boolean extensible) {
+        protected PropertyMap addBoundProperty(final PropertyMap propMap, final ScriptObject source, final org.openjdk.nashorn.internal.runtime.Property property, final boolean extensible) {
             // We override this method just to make it callable by Global
             return super.addBoundProperty(propMap, source, property, extensible);
         }
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/IteratorResult.java
similarity index 85%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/IteratorResult.java
index 33c85753e..d8f353e79 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/IteratorResult.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/IteratorResult.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 @ScriptClass("IteratorResult")
 public class IteratorResult extends ScriptObject {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/LinkedMap.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/LinkedMap.java
index 4e7187cef..8da87e3a7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/LinkedMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/LinkedMap.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/MapIterator.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/MapIterator.java
index 549e5963c..8662b9a33 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/MapIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/MapIterator.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 /**
  * ECMA6 23.1.5 Map Iterator Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArguments.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArguments.java
index c9e9bd571..4277149aa 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArguments.java
@@ -23,27 +23,27 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
-import jdk.nashorn.internal.runtime.AccessorProperty;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.AccessorProperty;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
 
 /**
  * ECMA 10.6 Arguments Object.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArray.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArray.java
index d311c85a0..30d0ba83b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArray.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
-import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.arrayLikeIterator;
-import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.reverseArrayLikeIterator;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.arrayLikeIterator;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.reverseArrayLikeIterator;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
 
 import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
@@ -45,34 +45,34 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Setter;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.OptimisticBuiltins;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
-import jdk.nashorn.internal.runtime.arrays.ContinuousArrayData;
-import jdk.nashorn.internal.runtime.arrays.IntElements;
-import jdk.nashorn.internal.runtime.arrays.IteratorAction;
-import jdk.nashorn.internal.runtime.arrays.NumericElements;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Setter;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.OptimisticBuiltins;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import org.openjdk.nashorn.internal.runtime.arrays.ContinuousArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.IntElements;
+import org.openjdk.nashorn.internal.runtime.arrays.IteratorAction;
+import org.openjdk.nashorn.internal.runtime.arrays.NumericElements;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
 
 /**
  * Runtime representation of a JavaScript array. NativeArray only holds numeric
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArrayBuffer.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArrayBuffer.java
index bfb8f1089..b9d9206db 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeArrayBuffer.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.nio.ByteBuffer;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * NativeArrayBuffer - ArrayBuffer as described in the JS typed
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeBoolean.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeBoolean.java
index 0bafc47a4..7646acbec 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeBoolean.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
 /**
  * ECMA 15.6 Boolean Objects.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDataView.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDataView.java
index 759c168bb..56c57d518 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDataView.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * 

diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDate.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDate.java
index 78dd464be..f2e22e3f1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDate.java
@@ -23,31 +23,31 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import static java.lang.Double.NaN;
 import static java.lang.Double.isInfinite;
 import static java.lang.Double.isNaN;
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.Callable;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.parser.DateParser;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.parser.DateParser;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
 
 /**
  * ECMA 15.9 Date Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDebug.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDebug.java
index 4409c0bda..f676782a5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeDebug.java
@@ -23,28 +23,28 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.Objects;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertySwitchPoints;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.Scope;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.events.RuntimeEvent;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertySwitchPoints;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.Scope;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.events.RuntimeEvent;
+import org.openjdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Nashorn specific debug utils. This is meant for Nashorn developers.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeError.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeError.java
index 7d3221ae2..409d39736 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeError.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.api.scripting.NashornException;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * ECMA 15.11 Error Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeEvalError.java
similarity index 83%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeEvalError.java
index 586c7cffb..befd59078 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeEvalError.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.11.6.1 EvalError
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFloat32Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFloat32Array.java
index bf5f68c4f..f98f8451c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFloat32Array.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Float32 array for the TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFloat64Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFloat64Array.java
index 0a46907cd..c9e123a2f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFloat64Array.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Float64 array for the TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFunction.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFunction.java
index 61df4e4ab..9d61f6b36 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeFunction.java
@@ -23,33 +23,33 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
 import jdk.dynalink.linker.support.Lookup;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.parser.Parser;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.parser.Parser;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
  * ECMA 15.3 Function Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt16Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt16Array.java
index 4700e2750..8e5552237 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt16Array.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.ShortBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Int16 array for the TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt32Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt32Array.java
index 4292985d2..9f012393d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt32Array.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Int32 array for the TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt8Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt8Array.java
index 13f00581f..3f5b31fce 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeInt8Array.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Int8Array for the TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJSAdapter.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJSAdapter.java
index ac90b8bdf..3fc6e749a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -39,18 +39,18 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.FindProperty;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.scripts.JO;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.FindProperty;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.scripts.JO;
 
 /**
  * This class is the implementation of the Nashorn-specific global object named {@code JSAdapter}. It can be thought of
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJSON.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJSON.java
index 32cb48ce7..9e894bf90 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJSON.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
@@ -37,20 +37,20 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.JSONFunctions;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.JSONFunctions;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
 
 /**
  * ECMAScript 262 Edition 5, Section 15.12 The NativeJSON Object
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJava.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJava.java
index 55b9dcf40..e5b58c8e1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJava.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Array;
@@ -41,22 +41,22 @@
 import jdk.dynalink.beans.BeansLinker;
 import jdk.dynalink.beans.StaticClass;
 import jdk.dynalink.linker.support.TypeUtilities;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.api.scripting.ScriptUtils;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ListAdapter;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptUtils;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ListAdapter;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
 
 /**
  * This class is the implementation for the {@code Java} global object exposed to programs running under Nashorn. This
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJavaImporter.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJavaImporter.java
index 310180e9e..7879d7cf6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeJavaImporter.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import jdk.dynalink.beans.StaticClass;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.FindProperty;
-import jdk.nashorn.internal.runtime.NativeJavaPackage;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.FindProperty;
+import org.openjdk.nashorn.internal.runtime.NativeJavaPackage;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * This is "JavaImporter" constructor. This constructor allows you to use Java types omitting explicit package names.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeMap.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeMap.java
index 7c173f9c8..9bc95b395 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeMap.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import java.lang.invoke.MethodHandle;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 /**
  * This implements the ECMA6 Map object.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeMath.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeMath.java
index d73fb8afe..39fb549e5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeMath.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
-
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+package org.openjdk.nashorn.internal.objects;
+
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.8 The Math Object
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeNumber.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeNumber.java
index c52e1b35f..9687720e5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeNumber.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -36,20 +36,20 @@
 import java.util.Locale;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
-import jdk.nashorn.internal.runtime.linker.NashornGuards;
-import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
+import org.openjdk.nashorn.internal.runtime.linker.NashornGuards;
+import org.openjdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
 /**
  * ECMA 15.7 Number Objects.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeObject.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeObject.java
index 718d82b60..feb0e071b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeObject.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import static jdk.dynalink.StandardNamespace.METHOD;
 import static jdk.dynalink.StandardNamespace.PROPERTY;
 import static jdk.dynalink.StandardOperation.GET;
 import static jdk.dynalink.StandardOperation.SET;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -51,26 +51,26 @@
 import jdk.dynalink.linker.GuardingDynamicLinker;
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.support.SimpleLinkRequest;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.AccessorProperty;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
-import jdk.nashorn.internal.runtime.linker.NashornBeansLinker;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.AccessorProperty;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.internal.runtime.linker.NashornBeansLinker;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * ECMA 15.2 Object objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRangeError.java
similarity index 83%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRangeError.java
index ff3ac7b77..a5890da9c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRangeError.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.11.6.2 RangeError
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeReferenceError.java
similarity index 83%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeReferenceError.java
index 741901796..1e2cd5f3d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeReferenceError.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.11.6.3 ReferenceError
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRegExp.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRegExp.java
index 5dd140352..4ab7e6b0b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRegExp.java
@@ -23,35 +23,35 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.BitVector;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.regexp.RegExp;
-import jdk.nashorn.internal.runtime.regexp.RegExpFactory;
-import jdk.nashorn.internal.runtime.regexp.RegExpMatcher;
-import jdk.nashorn.internal.runtime.regexp.RegExpResult;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.BitVector;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExp;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpFactory;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpMatcher;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpResult;
 
 /**
  * ECMA 15.10 RegExp Objects.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRegExpExecResult.java
similarity index 80%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRegExpExecResult.java
index 1ec733cf3..b1fd997e6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeRegExpExecResult.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Setter;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.regexp.RegExpResult;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Setter;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpResult;
 
 /**
  * Objects of this class are used to represent return values from
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSet.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSet.java
index da3ebe12c..219dbefc7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSet.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSet.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-
-import static jdk.nashorn.internal.objects.NativeMap.convertKey;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+
+import static org.openjdk.nashorn.internal.objects.NativeMap.convertKey;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 /**
  * This implements the ECMA6 Set object.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeStrictArguments.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeStrictArguments.java
index 47ecaeeb2..3a4e3561f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeStrictArguments.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
-import jdk.nashorn.internal.runtime.AccessorProperty;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.AccessorProperty;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
 
 /**
  * ECMA 10.6 Arguments Object.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeString.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeString.java
index 0542397a7..fe18d7076 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeString.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -44,26 +44,26 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.lookup.MethodHandleFactory.LookupException;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.OptimisticBuiltins;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuards;
-import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory.LookupException;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.OptimisticBuiltins;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.linker.NashornGuards;
+import org.openjdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
 
 /**
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSymbol.java
similarity index 85%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSymbol.java
index d4ef0d9ba..73f1b9a3c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSymbol.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSymbol.java
@@ -23,31 +23,31 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.WeakValueCache;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Getter;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Symbol;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.openjdk.nashorn.internal.WeakValueCache;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Getter;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Symbol;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
 /**
  * ECMAScript 6 - 19.4 Symbol Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSyntaxError.java
similarity index 82%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSyntaxError.java
index db7debb01..a6e477797 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeSyntaxError.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.11.6.4 SyntaxError
@@ -98,5 +98,3 @@ public static NativeSyntaxError constructor(final boolean newObj, final Object s
         return new NativeSyntaxError(msg);
     }
 }
-
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeTypeError.java
similarity index 82%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeTypeError.java
index 6e5a4934f..30c476cf2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeTypeError.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.11.6.5 TypeError
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeURIError.java
similarity index 82%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeURIError.java
index cf5fdaa04..1e3984352 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeURIError.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * ECMA 15.11.6.6 URIError
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint16Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint16Array.java
index 0dfd2754c..bb493be11 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint16Array.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Uint16 array for TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint32Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint32Array.java
index 7b91eb283..6cdde92d2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint32Array.java
@@ -23,28 +23,28 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Uint32 array for TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint8Array.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint8Array.java
index 3b11a54be..4bdcff118 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint8Array.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Uint8 array for TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint8ClampedArray.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint8ClampedArray.java
index 2edf2a766..0a093e620 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeUint8ClampedArray.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.Property;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.TypedArrayData;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.Property;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.objects.annotations.Where;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.TypedArrayData;
 
 /**
  * Uint8 clamped array for TypedArray extension
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeWeakMap.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeWeakMap.java
index 7b08a78f8..a271d029d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeWeakMap.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import java.util.Map;
 import java.util.WeakHashMap;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
-
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.isPrimitive;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.isPrimitive;
 
 /**
  * This implements the ECMA6 WeakMap object.
@@ -178,5 +178,3 @@ private static NativeWeakMap getMap(final Object self) {
     }
 
 }
-
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeWeakSet.java
similarity index 85%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeWeakSet.java
index fb27bffc7..7b98ae814 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeWeakSet.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/NativeWeakSet.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 import java.util.Map;
 import java.util.WeakHashMap;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Constructor;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
-import static jdk.nashorn.internal.objects.NativeWeakMap.checkKey;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.isPrimitive;
+import static org.openjdk.nashorn.internal.objects.NativeWeakMap.checkKey;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.isPrimitive;
 
 /**
  * This implements the ECMA6 WeakSet object.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/SetIterator.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/SetIterator.java
index ac504bc50..f2aa5d2d1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/SetIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/SetIterator.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 /**
  * ECMA6 23.2.5 Set Iterator Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/StringIterator.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/StringIterator.java
index 2c3cf0bb4..9586997b5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/StringIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/StringIterator.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.objects.annotations.ScriptClass;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.objects.annotations.ScriptClass;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 /**
  * ECMA6 21.1.5 String Iterator Objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Attribute.java
similarity index 83%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Attribute.java
index f14d2e3fe..d55806dc6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Attribute.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
 /**
  * Attributes for JavaScript properties. The negative logic "NOT_xxx" is because the
@@ -32,13 +32,13 @@
 
 public interface Attribute {
     /** Flag for non-writable properties */
-    public static final int NOT_WRITABLE     = jdk.nashorn.internal.runtime.Property.NOT_WRITABLE;
+    public static final int NOT_WRITABLE     = org.openjdk.nashorn.internal.runtime.Property.NOT_WRITABLE;
 
     /** Flag for non-enumerable properties */
-    public static final int NOT_ENUMERABLE   = jdk.nashorn.internal.runtime.Property.NOT_ENUMERABLE;
+    public static final int NOT_ENUMERABLE   = org.openjdk.nashorn.internal.runtime.Property.NOT_ENUMERABLE;
 
     /** Flag for non-configurable properties */
-    public static final int NOT_CONFIGURABLE = jdk.nashorn.internal.runtime.Property.NOT_CONFIGURABLE;
+    public static final int NOT_CONFIGURABLE = org.openjdk.nashorn.internal.runtime.Property.NOT_CONFIGURABLE;
 
     /**
      * Flag for accessor (getter/setter) properties as opposed to data properties.
@@ -48,7 +48,7 @@ public interface Attribute {
      * such as Map.prototype.size in ES6, not value properties that happen to be implemented by getter/setter
      * such as the "length" properties of String or Array objects.

      */
-    public static final int IS_ACCESSOR = jdk.nashorn.internal.runtime.Property.IS_ACCESSOR_PROPERTY;
+    public static final int IS_ACCESSOR = org.openjdk.nashorn.internal.runtime.Property.IS_ACCESSOR_PROPERTY;
 
     /** Read-only, non-configurable property */
     public static final int CONSTANT = NOT_WRITABLE | NOT_CONFIGURABLE;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Constructor.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Constructor.java
index a04a2badc..56aa07a6e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Constructor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Function.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Function.java
index b405f3c3c..c703b1550 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Function.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
-import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+import static org.openjdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Getter.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Getter.java
index f20b7e859..0b5d8ab8e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Getter.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
-import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+import static org.openjdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Optimistic.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Optimistic.java
index 09e3b2a56..08dcdcaea 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Optimistic.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Property.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Property.java
index 7da82fe16..a04cea360 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Property.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
-import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+import static org.openjdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/ScriptClass.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/ScriptClass.java
index 4c0e0b2be..554822433 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/ScriptClass.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Setter.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Setter.java
index beeca98c3..053c9acc2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Setter.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
-import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+import static org.openjdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/SpecializedFunction.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/SpecializedFunction.java
index b6aeaa9eb..3bfb8138f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/SpecializedFunction.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,8 +32,8 @@
 import java.lang.invoke.MethodHandle;
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 
 /**
  * The SpecializedFunction annotation is used to flag more type specific
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Where.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Where.java
index 9153afe1e..01e6ee631 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/annotations/Where.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects.annotations;
+package org.openjdk.nashorn.internal.objects.annotations;
 
 /**
  * Enum to tell where a Function or Property belongs.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/package-info.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/package-info.java
index 6a106ec8b..6a5fd370a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/objects/package-info.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.objects;
+package org.openjdk.nashorn.internal.objects;
 
 /**
  * Classes from this package should never be directly referred from
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/AbstractParser.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/AbstractParser.java
index 1b239da48..63835e750 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/AbstractParser.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
-import static jdk.nashorn.internal.parser.TokenType.COMMENT;
-import static jdk.nashorn.internal.parser.TokenType.DIRECTIVE_COMMENT;
-import static jdk.nashorn.internal.parser.TokenType.EOF;
-import static jdk.nashorn.internal.parser.TokenType.EOL;
-import static jdk.nashorn.internal.parser.TokenType.IDENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.COMMENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.DIRECTIVE_COMMENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOF;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOL;
+import static org.openjdk.nashorn.internal.parser.TokenType.IDENT;
 import java.util.HashMap;
 import java.util.Map;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.parser.Lexer.LexerToken;
-import jdk.nashorn.internal.parser.Lexer.RegexToken;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSErrorType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.regexp.RegExpFactory;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.parser.Lexer.LexerToken;
+import org.openjdk.nashorn.internal.parser.Lexer.RegexToken;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSErrorType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpFactory;
 
 /**
  * Base class for parsers.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/DateParser.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/DateParser.java
index 4145dcb2f..7707f9cc0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/DateParser.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import static java.lang.Character.DECIMAL_DIGIT_NUMBER;
 import static java.lang.Character.LOWERCASE_LETTER;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/JSONParser.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/JSONParser.java
index 88513a996..09461ce87 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/JSONParser.java
@@ -23,28 +23,28 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSErrorType;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.SpillProperty;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.scripts.JD;
-import jdk.nashorn.internal.scripts.JO;
-
-import static jdk.nashorn.internal.parser.TokenType.STRING;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSErrorType;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.SpillProperty;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.scripts.JD;
+import org.openjdk.nashorn.internal.scripts.JO;
+
+import static org.openjdk.nashorn.internal.parser.TokenType.STRING;
 
 /**
  * Parses JSON text and returns the corresponding IR node. This is derived from
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Lexer.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Lexer.java
index 8266e7052..08c8c75e0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Lexer.java
@@ -23,44 +23,44 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
-
-import static jdk.nashorn.internal.parser.TokenType.ADD;
-import static jdk.nashorn.internal.parser.TokenType.BINARY_NUMBER;
-import static jdk.nashorn.internal.parser.TokenType.COMMENT;
-import static jdk.nashorn.internal.parser.TokenType.DECIMAL;
-import static jdk.nashorn.internal.parser.TokenType.DIRECTIVE_COMMENT;
-import static jdk.nashorn.internal.parser.TokenType.EOF;
-import static jdk.nashorn.internal.parser.TokenType.EOL;
-import static jdk.nashorn.internal.parser.TokenType.ERROR;
-import static jdk.nashorn.internal.parser.TokenType.ESCSTRING;
-import static jdk.nashorn.internal.parser.TokenType.EXECSTRING;
-import static jdk.nashorn.internal.parser.TokenType.FLOATING;
-import static jdk.nashorn.internal.parser.TokenType.FUNCTION;
-import static jdk.nashorn.internal.parser.TokenType.HEXADECIMAL;
-import static jdk.nashorn.internal.parser.TokenType.LBRACE;
-import static jdk.nashorn.internal.parser.TokenType.LPAREN;
-import static jdk.nashorn.internal.parser.TokenType.OCTAL;
-import static jdk.nashorn.internal.parser.TokenType.OCTAL_LEGACY;
-import static jdk.nashorn.internal.parser.TokenType.RBRACE;
-import static jdk.nashorn.internal.parser.TokenType.REGEX;
-import static jdk.nashorn.internal.parser.TokenType.RPAREN;
-import static jdk.nashorn.internal.parser.TokenType.STRING;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE_HEAD;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE_MIDDLE;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE_TAIL;
-import static jdk.nashorn.internal.parser.TokenType.XML;
+package org.openjdk.nashorn.internal.parser;
+
+import static org.openjdk.nashorn.internal.parser.TokenType.ADD;
+import static org.openjdk.nashorn.internal.parser.TokenType.BINARY_NUMBER;
+import static org.openjdk.nashorn.internal.parser.TokenType.COMMENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.DECIMAL;
+import static org.openjdk.nashorn.internal.parser.TokenType.DIRECTIVE_COMMENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOF;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOL;
+import static org.openjdk.nashorn.internal.parser.TokenType.ERROR;
+import static org.openjdk.nashorn.internal.parser.TokenType.ESCSTRING;
+import static org.openjdk.nashorn.internal.parser.TokenType.EXECSTRING;
+import static org.openjdk.nashorn.internal.parser.TokenType.FLOATING;
+import static org.openjdk.nashorn.internal.parser.TokenType.FUNCTION;
+import static org.openjdk.nashorn.internal.parser.TokenType.HEXADECIMAL;
+import static org.openjdk.nashorn.internal.parser.TokenType.LBRACE;
+import static org.openjdk.nashorn.internal.parser.TokenType.LPAREN;
+import static org.openjdk.nashorn.internal.parser.TokenType.OCTAL;
+import static org.openjdk.nashorn.internal.parser.TokenType.OCTAL_LEGACY;
+import static org.openjdk.nashorn.internal.parser.TokenType.RBRACE;
+import static org.openjdk.nashorn.internal.parser.TokenType.REGEX;
+import static org.openjdk.nashorn.internal.parser.TokenType.RPAREN;
+import static org.openjdk.nashorn.internal.parser.TokenType.STRING;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE_HEAD;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE_MIDDLE;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE_TAIL;
+import static org.openjdk.nashorn.internal.parser.TokenType.XML;
 
 import java.io.Serializable;
 
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSErrorType;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSErrorType;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Responsible for converting source content into a stream of tokens.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Parser.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Parser.java
index 51dcdf968..475c8b28d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Parser.java
@@ -23,60 +23,60 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
-
-import static jdk.nashorn.internal.codegen.CompilerConstants.ANON_FUNCTION_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.EVAL;
-import static jdk.nashorn.internal.codegen.CompilerConstants.PROGRAM;
-import static jdk.nashorn.internal.parser.TokenType.ARROW;
-import static jdk.nashorn.internal.parser.TokenType.ASSIGN;
-import static jdk.nashorn.internal.parser.TokenType.CASE;
-import static jdk.nashorn.internal.parser.TokenType.CATCH;
-import static jdk.nashorn.internal.parser.TokenType.CLASS;
-import static jdk.nashorn.internal.parser.TokenType.COLON;
-import static jdk.nashorn.internal.parser.TokenType.COMMARIGHT;
-import static jdk.nashorn.internal.parser.TokenType.COMMENT;
-import static jdk.nashorn.internal.parser.TokenType.CONST;
-import static jdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
-import static jdk.nashorn.internal.parser.TokenType.DECPREFIX;
-import static jdk.nashorn.internal.parser.TokenType.ELLIPSIS;
-import static jdk.nashorn.internal.parser.TokenType.ELSE;
-import static jdk.nashorn.internal.parser.TokenType.EOF;
-import static jdk.nashorn.internal.parser.TokenType.EOL;
-import static jdk.nashorn.internal.parser.TokenType.EQ_STRICT;
-import static jdk.nashorn.internal.parser.TokenType.ESCSTRING;
-import static jdk.nashorn.internal.parser.TokenType.EXPORT;
-import static jdk.nashorn.internal.parser.TokenType.EXTENDS;
-import static jdk.nashorn.internal.parser.TokenType.FINALLY;
-import static jdk.nashorn.internal.parser.TokenType.FUNCTION;
-import static jdk.nashorn.internal.parser.TokenType.IDENT;
-import static jdk.nashorn.internal.parser.TokenType.IF;
-import static jdk.nashorn.internal.parser.TokenType.IMPORT;
-import static jdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
-import static jdk.nashorn.internal.parser.TokenType.LBRACE;
-import static jdk.nashorn.internal.parser.TokenType.LBRACKET;
-import static jdk.nashorn.internal.parser.TokenType.LET;
-import static jdk.nashorn.internal.parser.TokenType.LPAREN;
-import static jdk.nashorn.internal.parser.TokenType.MUL;
-import static jdk.nashorn.internal.parser.TokenType.PERIOD;
-import static jdk.nashorn.internal.parser.TokenType.RBRACE;
-import static jdk.nashorn.internal.parser.TokenType.RBRACKET;
-import static jdk.nashorn.internal.parser.TokenType.RPAREN;
-import static jdk.nashorn.internal.parser.TokenType.SEMICOLON;
-import static jdk.nashorn.internal.parser.TokenType.SPREAD_ARRAY;
-import static jdk.nashorn.internal.parser.TokenType.STATIC;
-import static jdk.nashorn.internal.parser.TokenType.STRING;
-import static jdk.nashorn.internal.parser.TokenType.SUPER;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE_HEAD;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE_MIDDLE;
-import static jdk.nashorn.internal.parser.TokenType.TEMPLATE_TAIL;
-import static jdk.nashorn.internal.parser.TokenType.TERNARY;
-import static jdk.nashorn.internal.parser.TokenType.VAR;
-import static jdk.nashorn.internal.parser.TokenType.VOID;
-import static jdk.nashorn.internal.parser.TokenType.WHILE;
-import static jdk.nashorn.internal.parser.TokenType.YIELD;
-import static jdk.nashorn.internal.parser.TokenType.YIELD_STAR;
+package org.openjdk.nashorn.internal.parser;
+
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.ANON_FUNCTION_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.EVAL;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.PROGRAM;
+import static org.openjdk.nashorn.internal.parser.TokenType.ARROW;
+import static org.openjdk.nashorn.internal.parser.TokenType.ASSIGN;
+import static org.openjdk.nashorn.internal.parser.TokenType.CASE;
+import static org.openjdk.nashorn.internal.parser.TokenType.CATCH;
+import static org.openjdk.nashorn.internal.parser.TokenType.CLASS;
+import static org.openjdk.nashorn.internal.parser.TokenType.COLON;
+import static org.openjdk.nashorn.internal.parser.TokenType.COMMARIGHT;
+import static org.openjdk.nashorn.internal.parser.TokenType.COMMENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.CONST;
+import static org.openjdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
+import static org.openjdk.nashorn.internal.parser.TokenType.DECPREFIX;
+import static org.openjdk.nashorn.internal.parser.TokenType.ELLIPSIS;
+import static org.openjdk.nashorn.internal.parser.TokenType.ELSE;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOF;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOL;
+import static org.openjdk.nashorn.internal.parser.TokenType.EQ_STRICT;
+import static org.openjdk.nashorn.internal.parser.TokenType.ESCSTRING;
+import static org.openjdk.nashorn.internal.parser.TokenType.EXPORT;
+import static org.openjdk.nashorn.internal.parser.TokenType.EXTENDS;
+import static org.openjdk.nashorn.internal.parser.TokenType.FINALLY;
+import static org.openjdk.nashorn.internal.parser.TokenType.FUNCTION;
+import static org.openjdk.nashorn.internal.parser.TokenType.IDENT;
+import static org.openjdk.nashorn.internal.parser.TokenType.IF;
+import static org.openjdk.nashorn.internal.parser.TokenType.IMPORT;
+import static org.openjdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
+import static org.openjdk.nashorn.internal.parser.TokenType.LBRACE;
+import static org.openjdk.nashorn.internal.parser.TokenType.LBRACKET;
+import static org.openjdk.nashorn.internal.parser.TokenType.LET;
+import static org.openjdk.nashorn.internal.parser.TokenType.LPAREN;
+import static org.openjdk.nashorn.internal.parser.TokenType.MUL;
+import static org.openjdk.nashorn.internal.parser.TokenType.PERIOD;
+import static org.openjdk.nashorn.internal.parser.TokenType.RBRACE;
+import static org.openjdk.nashorn.internal.parser.TokenType.RBRACKET;
+import static org.openjdk.nashorn.internal.parser.TokenType.RPAREN;
+import static org.openjdk.nashorn.internal.parser.TokenType.SEMICOLON;
+import static org.openjdk.nashorn.internal.parser.TokenType.SPREAD_ARRAY;
+import static org.openjdk.nashorn.internal.parser.TokenType.STATIC;
+import static org.openjdk.nashorn.internal.parser.TokenType.STRING;
+import static org.openjdk.nashorn.internal.parser.TokenType.SUPER;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE_HEAD;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE_MIDDLE;
+import static org.openjdk.nashorn.internal.parser.TokenType.TEMPLATE_TAIL;
+import static org.openjdk.nashorn.internal.parser.TokenType.TERNARY;
+import static org.openjdk.nashorn.internal.parser.TokenType.VAR;
+import static org.openjdk.nashorn.internal.parser.TokenType.VOID;
+import static org.openjdk.nashorn.internal.parser.TokenType.WHILE;
+import static org.openjdk.nashorn.internal.parser.TokenType.YIELD;
+import static org.openjdk.nashorn.internal.parser.TokenType.YIELD_STAR;
 
 import java.io.Serializable;
 import java.util.ArrayDeque;
@@ -90,68 +90,68 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.BaseNode;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.BlockStatement;
-import jdk.nashorn.internal.ir.BreakNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.CaseNode;
-import jdk.nashorn.internal.ir.CatchNode;
-import jdk.nashorn.internal.ir.ClassNode;
-import jdk.nashorn.internal.ir.ContinueNode;
-import jdk.nashorn.internal.ir.DebuggerNode;
-import jdk.nashorn.internal.ir.EmptyNode;
-import jdk.nashorn.internal.ir.ErrorNode;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.ExpressionList;
-import jdk.nashorn.internal.ir.ExpressionStatement;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IfNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.JoinPredecessorExpression;
-import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.Module;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyKey;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.Statement;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.TemplateLiteral;
-import jdk.nashorn.internal.ir.TernaryNode;
-import jdk.nashorn.internal.ir.ThrowNode;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.WhileNode;
-import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
-import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSErrorType;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptingFunctions;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.Timing;
-import jdk.nashorn.internal.runtime.linker.NameCodec;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.Namespace;
+import org.openjdk.nashorn.internal.ir.AccessNode;
+import org.openjdk.nashorn.internal.ir.BaseNode;
+import org.openjdk.nashorn.internal.ir.BinaryNode;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.BlockStatement;
+import org.openjdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.CallNode;
+import org.openjdk.nashorn.internal.ir.CaseNode;
+import org.openjdk.nashorn.internal.ir.CatchNode;
+import org.openjdk.nashorn.internal.ir.ClassNode;
+import org.openjdk.nashorn.internal.ir.ContinueNode;
+import org.openjdk.nashorn.internal.ir.DebuggerNode;
+import org.openjdk.nashorn.internal.ir.EmptyNode;
+import org.openjdk.nashorn.internal.ir.ErrorNode;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.ExpressionList;
+import org.openjdk.nashorn.internal.ir.ExpressionStatement;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.IfNode;
+import org.openjdk.nashorn.internal.ir.IndexNode;
+import org.openjdk.nashorn.internal.ir.JoinPredecessorExpression;
+import org.openjdk.nashorn.internal.ir.LabelNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.LiteralNode;
+import org.openjdk.nashorn.internal.ir.Module;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.ObjectNode;
+import org.openjdk.nashorn.internal.ir.PropertyKey;
+import org.openjdk.nashorn.internal.ir.PropertyNode;
+import org.openjdk.nashorn.internal.ir.ReturnNode;
+import org.openjdk.nashorn.internal.ir.RuntimeNode;
+import org.openjdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.TemplateLiteral;
+import org.openjdk.nashorn.internal.ir.TernaryNode;
+import org.openjdk.nashorn.internal.ir.ThrowNode;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.UnaryNode;
+import org.openjdk.nashorn.internal.ir.VarNode;
+import org.openjdk.nashorn.internal.ir.WhileNode;
+import org.openjdk.nashorn.internal.ir.WithNode;
+import org.openjdk.nashorn.internal.ir.debug.ASTWriter;
+import org.openjdk.nashorn.internal.ir.debug.PrintVisitor;
+import org.openjdk.nashorn.internal.ir.visitor.NodeVisitor;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSErrorType;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.ScriptingFunctions;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.Timing;
+import org.openjdk.nashorn.internal.runtime.linker.NameCodec;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Builds the IR.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContext.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContext.java
index fd2476a7c..ba440edd1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContext.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContext.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import jdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.Statement;
 
 /**
  * A class that tracks the current lexical context of node visitation as a stack of {@code ParserContextNode} nodes. Has special
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBaseNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBaseNode.java
index d0fca9cd0..b4f9e5a0c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBaseNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBaseNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.Statement;
 
 /**
  * Base class for parser context nodes
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBlockNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBlockNode.java
index e87bd1293..c789126b1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBlockNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBlockNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  * A ParserContextNode that represents a block that is currently being parsed
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBreakableNode.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBreakableNode.java
index cb0b46d9c..f1b5a8457 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextBreakableNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextBreakableNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
-import jdk.nashorn.internal.ir.BreakNode;
+import org.openjdk.nashorn.internal.ir.BreakNode;
 
 /**
  * An interface that is implemented by ParserContextNodes that can
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextFunctionNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextFunctionNode.java
index 34e1e0cca..668c53337 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextFunctionNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextFunctionNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.Module;
+import org.openjdk.nashorn.internal.codegen.Namespace;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.Module;
 
 /**
  * ParserContextNode that represents a function that is currently being parsed
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextLabelNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextLabelNode.java
index a5179107b..1bcff3a3b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLabelNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextLabelNode.java
@@ -23,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  * ParserContextNode that represents a LabelNode
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextLoopNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextLoopNode.java
index 31e4b3ad5..4ef5f6506 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextLoopNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextLoopNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  * A ParserContextNode that represents a loop that is being parsed
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextModuleNode.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextModuleNode.java
index d62df90bd..c028b0ac5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextModuleNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextModuleNode.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.Module;
-import jdk.nashorn.internal.ir.Module.ExportEntry;
-import jdk.nashorn.internal.ir.Module.ImportEntry;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.Module;
+import org.openjdk.nashorn.internal.ir.Module.ExportEntry;
+import org.openjdk.nashorn.internal.ir.Module.ImportEntry;
 
 /**
  * ParserContextNode that represents a module.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextNode.java
index 416ba7629..5953b3e1a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextNode.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 import java.util.List;
-import jdk.nashorn.internal.ir.Statement;
+import org.openjdk.nashorn.internal.ir.Statement;
 
 /**
  * Used for keeping state when needed in the parser.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextSwitchNode.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextSwitchNode.java
index ec0d2d0ec..571f37a06 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/ParserContextSwitchNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/ParserContextSwitchNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  * A ParserContextNode that represents a SwitchNode that is currently being parsed
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Scanner.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Scanner.java
index 330343940..30a8f7e01 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Scanner.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  * Utility for scanning thru a char array.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Token.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Token.java
index 1eb58a507..906bc7c24 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/Token.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
-import static jdk.nashorn.internal.parser.TokenKind.LITERAL;
+import static org.openjdk.nashorn.internal.parser.TokenKind.LITERAL;
 
-import jdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.Source;
 
 /**
  * A token is a 64 bit long value that represents a basic parse/lex unit.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenKind.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenKind.java
index af3029da8..801a5b5b4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenKind.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  * Classification of token types.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenLookup.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenLookup.java
index 56bd37c48..772e6f7b5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenLookup.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
-import static jdk.nashorn.internal.parser.TokenKind.SPECIAL;
-import static jdk.nashorn.internal.parser.TokenType.IDENT;
+import static org.openjdk.nashorn.internal.parser.TokenKind.SPECIAL;
+import static org.openjdk.nashorn.internal.parser.TokenType.IDENT;
 
 /**
  * Fast lookup of operators and keywords.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenStream.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenStream.java
index f7df999f9..684aaf712 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenStream.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
 /**
  *
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenType.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenType.java
index 54f89dbcc..27b4aad50 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/parser/TokenType.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package org.openjdk.nashorn.internal.parser;
 
-import static jdk.nashorn.internal.parser.TokenKind.BINARY;
-import static jdk.nashorn.internal.parser.TokenKind.BRACKET;
-import static jdk.nashorn.internal.parser.TokenKind.FUTURE;
-import static jdk.nashorn.internal.parser.TokenKind.FUTURESTRICT;
-import static jdk.nashorn.internal.parser.TokenKind.IR;
-import static jdk.nashorn.internal.parser.TokenKind.KEYWORD;
-import static jdk.nashorn.internal.parser.TokenKind.LITERAL;
-import static jdk.nashorn.internal.parser.TokenKind.SPECIAL;
-import static jdk.nashorn.internal.parser.TokenKind.UNARY;
+import static org.openjdk.nashorn.internal.parser.TokenKind.BINARY;
+import static org.openjdk.nashorn.internal.parser.TokenKind.BRACKET;
+import static org.openjdk.nashorn.internal.parser.TokenKind.FUTURE;
+import static org.openjdk.nashorn.internal.parser.TokenKind.FUTURESTRICT;
+import static org.openjdk.nashorn.internal.parser.TokenKind.IR;
+import static org.openjdk.nashorn.internal.parser.TokenKind.KEYWORD;
+import static org.openjdk.nashorn.internal.parser.TokenKind.LITERAL;
+import static org.openjdk.nashorn.internal.parser.TokenKind.SPECIAL;
+import static org.openjdk.nashorn.internal.parser.TokenKind.UNARY;
 
 import java.util.Locale;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AccessControlContextFactory.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AccessControlContextFactory.java
index bdc72ef08..ccd6a7e97 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessControlContextFactory.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AccessControlContextFactory.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.security.AccessControlContext;
 import java.security.Permission;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AccessorProperty.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AccessorProperty.java
index e14860eb6..d0105f923 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AccessorProperty.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
-
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.createGetter;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.createSetter;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldCount;
-import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldName;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.lookup.MethodHandleFactory.stripName;
-import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
-import static jdk.nashorn.internal.runtime.JSType.getNumberOfAccessorTypes;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+package org.openjdk.nashorn.internal.runtime;
+
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_FIELD_TYPE;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.createGetter;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.createSetter;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldCount;
+import static org.openjdk.nashorn.internal.codegen.ObjectClassGenerator.getFieldName;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.MethodHandleFactory.stripName;
+import static org.openjdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
+import static org.openjdk.nashorn.internal.runtime.JSType.getNumberOfAccessorTypes;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.lang.invoke.MethodHandle;
@@ -42,10 +42,10 @@
 import java.lang.invoke.SwitchPoint;
 import java.util.function.Supplier;
 import java.util.logging.Level;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.objects.Global;
 
 /**
  * An AccessorProperty is the most generic property type. An AccessorProperty is
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AllocationStrategy.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AllocationStrategy.java
index f6ac2f49c..8b3f0b264 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AllocationStrategy.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AllocationStrategy.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.Serializable;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * Encapsulates the allocation strategy for a function when used as a constructor.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ArgumentSetter.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ArgumentSetter.java
index 8546ead18..b23e96857 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ArgumentSetter.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
 
 /**
  * A class with static helper methods invoked from generated bytecode for setting values of parameters of variable-arity
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AstDeserializer.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AstDeserializer.java
index ea5454bda..fa4c65570 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstDeserializer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AstDeserializer.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.zip.InflaterInputStream;
-import jdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
 
 /**
  * This static utility class performs deserialization of FunctionNode ASTs from a byte array.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AstSerializer.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AstSerializer.java
index 35036d85d..10cd750dc 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AstSerializer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/AstSerializer.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This static utility class performs serialization of FunctionNode ASTs to a byte array.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/BitVector.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/BitVector.java
index cbf4eb8cc..e4fd4fb0f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/BitVector.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.Arrays;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CodeInstaller.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CodeInstaller.java
index 0fd3dbcd4..d2f775d0c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CodeInstaller.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.Collection;
 import java.util.Map;
-import jdk.nashorn.internal.codegen.ClassEmitter;
+import org.openjdk.nashorn.internal.codegen.ClassEmitter;
 
 /**
  * Interface for installing classes passed to the compiler.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CodeStore.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CodeStore.java
index a0abdbd7d..a2a2f1721 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CodeStore.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -38,12 +38,12 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Map;
-import jdk.nashorn.internal.codegen.OptimisticTypesPersistence;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.codegen.OptimisticTypesPersistence;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * A code cache for persistent caching of compiled scripts.
@@ -315,4 +315,3 @@ private boolean belowThreshold(final Source source) {
         }
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CommandExecutor.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CommandExecutor.java
index 2d875497c..455e0431d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CommandExecutor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CommandExecutor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -45,8 +45,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static jdk.nashorn.internal.runtime.CommandExecutor.RedirectType.*;
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.CommandExecutor.RedirectType.*;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
 
 /**
  * The CommandExecutor class provides support for Nashorn's $EXEC
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CompiledFunction.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CompiledFunction.java
index 3b4e27e9e..fc43e5669 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/CompiledFunction.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
@@ -44,16 +44,16 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import jdk.dynalink.linker.GuardedInvocation;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
-import jdk.nashorn.internal.codegen.TypeMap;
-import jdk.nashorn.internal.codegen.types.ArrayType;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
-import jdk.nashorn.internal.runtime.events.RecompilationEvent;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.Compiler.CompilationPhases;
+import org.openjdk.nashorn.internal.codegen.TypeMap;
+import org.openjdk.nashorn.internal.codegen.types.ArrayType;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
+import org.openjdk.nashorn.internal.runtime.events.RecompilationEvent;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
 
 /**
  * An version of a JavaScript function, native or JavaScript.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ConsString.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ConsString.java
index aa870a58d..fd69c4b3c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ConsString.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Context.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Context.java
index aeec38cc7..651a3ab16 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Context.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
-import static jdk.nashorn.internal.codegen.CompilerConstants.CREATE_PROGRAM_FUNCTION;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
-import static jdk.nashorn.internal.runtime.CodeStore.newCodeStore;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+package org.openjdk.nashorn.internal.runtime;
+
+import static org.objectweb.asm.Opcodes.V1_7;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.CREATE_PROGRAM_FUNCTION;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
+import static org.openjdk.nashorn.internal.runtime.CodeStore.newCodeStore;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 
 import java.io.File;
 import java.io.InputStream;
@@ -85,30 +85,30 @@
 import java.util.stream.Stream;
 import javax.script.ScriptEngine;
 import jdk.dynalink.DynamicLinker;
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.WeakValueCache;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
-import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.parser.Parser;
-import jdk.nashorn.internal.runtime.events.RuntimeEvent;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.LoggingOption.LoggerInfo;
-import jdk.nashorn.internal.runtime.options.Options;
-import jdk.internal.misc.Unsafe;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.util.CheckClassAdapter;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.WeakValueCache;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.Compiler.CompilationPhases;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.debug.ASTWriter;
+import org.openjdk.nashorn.internal.ir.debug.PrintVisitor;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.parser.Parser;
+import org.openjdk.nashorn.internal.runtime.events.RuntimeEvent;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.LoggingOption.LoggerInfo;
+import org.openjdk.nashorn.internal.runtime.options.Options;
+import sun.misc.Unsafe;
 
 /**
  * This class manages the global state of execution. Context is immutable.
@@ -318,12 +318,29 @@ public CodeInstaller getMultiClassCodeInstaller() {
     private final WeakValueCache> anonymousHostClasses = new WeakValueCache<>();
 
     private static final class AnonymousContextCodeInstaller extends ContextCodeInstaller {
-        private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+        private static final MethodHandle DEFINE_ANONYMOUS_CLASS = getDefineAnonymousClass();
         private static final String ANONYMOUS_HOST_CLASS_NAME = Compiler.SCRIPTS_PACKAGE.replace('/', '.') + ".AnonymousHost";
         private static final byte[] ANONYMOUS_HOST_CLASS_BYTES = getAnonymousHostClassBytes();
 
         private final Class hostClass;
 
+        private static MethodHandle getDefineAnonymousClass() {
+            // Can't reference the Unsafe class at all outside of the doPrivileged block,
+            // not even as a type of the return value, hence we just export a MethodHandle
+            // out of it.
+            return AccessController.doPrivileged((PrivilegedAction) () -> {
+                try {
+                    final MethodHandle mh = MethodHandles.lookup().findVirtual(Unsafe.class, "defineAnonymousClass",
+                        MethodType.methodType(Class.class, Class.class, byte[].class, Object[].class));
+                    final Field f = Unsafe.class.getDeclaredField("theUnsafe");
+                    f.setAccessible(true);
+                    return mh.bindTo(f.get(null));
+                } catch (ReflectiveOperationException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
         private AnonymousContextCodeInstaller(final Context context, final CodeSource codeSource, final Class hostClass) {
             super(context, codeSource);
             this.hostClass = hostClass;
@@ -332,7 +349,13 @@ private AnonymousContextCodeInstaller(final Context context, final CodeSource co
         @Override
         public Class install(final String className, final byte[] bytecode) {
             ANONYMOUS_INSTALLED_SCRIPT_COUNT.increment();
-            return UNSAFE.defineAnonymousClass(hostClass, bytecode, null);
+            try {
+                return (Class)DEFINE_ANONYMOUS_CLASS.invokeExact(hostClass, bytecode, (Object[])null);
+            } catch (RuntimeException | Error e) {
+                throw e;
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override
@@ -1041,7 +1064,7 @@ public Global run() {
      * @see AccessorProperty
      * @see ScriptObject
      *
-     * @param fullName  full name of class, e.g. jdk.nashorn.internal.objects.JO2P1 contains 2 fields and 1 parameter.
+     * @param fullName  full name of class, e.g. org.openjdk.nashorn.internal.objects.JO2P1 contains 2 fields and 1 parameter.
      *
      * @return the {@code Class} for this structure
      *
@@ -1150,7 +1173,7 @@ public static boolean isAccessibleClass(final Class clazz) {
 
     /**
      * Lookup a Java class. This is used for JSR-223 stuff linking in from
-     * {@code jdk.nashorn.internal.objects.NativeJava} and {@code jdk.nashorn.internal.runtime.NativeJavaPackage}
+     * {@code org.openjdk.nashorn.internal.objects.NativeJava} and {@code org.openjdk.nashorn.internal.runtime.NativeJavaPackage}
      *
      * @param fullName full name of class to load
      *
@@ -1323,18 +1346,6 @@ public static DynamicLinker getDynamicLinker() {
         return getContextTrusted().dynamicLinker;
     }
 
-    /**
-     * Creates a module layer with one module that is defined to the given class
-     * loader.
-     *
-     * @param descriptor the module descriptor for the newly created module
-     * @param loader the class loader of the module
-     * @return the new Module
-     */
-    static Module createModuleTrusted(final ModuleDescriptor descriptor, final ClassLoader loader) {
-        return createModuleTrusted(ModuleLayer.boot(), descriptor, loader);
-    }
-
     /**
      * Creates a module layer with one module that is defined to the given class
      * loader.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Debug.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Debug.java
index 70103194c..447120706 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Debug.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.parser.TokenType.EOF;
+import static org.openjdk.nashorn.internal.parser.TokenType.EOF;
 
-import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.parser.Lexer;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenStream;
-import jdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.api.scripting.NashornException;
+import org.openjdk.nashorn.internal.parser.Lexer;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenStream;
+import org.openjdk.nashorn.internal.parser.TokenType;
 
 /**
  * Utilities for debugging Nashorn.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/DebuggerSupport.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/DebuggerSupport.java
index baa69d93d..fc99a2bb4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/DebuggerSupport.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.Set;
-import jdk.nashorn.internal.scripts.JS;
+import org.openjdk.nashorn.internal.scripts.JS;
 
 /**
  * This class provides support for external debuggers.  Its primary purpose is
@@ -389,5 +389,3 @@ private static String escape(final String value) {
         return sb.toString();
     }
 }
-
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/DefaultPropertyAccess.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/DefaultPropertyAccess.java
index e2304e339..a3db8b680 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/DefaultPropertyAccess.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 /**
  * If your ScriptObject or similar PropertyAccess implementation only provides the most
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ECMAErrors.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ECMAErrors.java
index 9dbd64232..d1f62b9d2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ECMAErrors.java
@@ -23,20 +23,20 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.scripts.JS;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.scripts.JS;
 
 /**
  * Helper class to throw various standard "ECMA error" exceptions such as Error, ReferenceError, TypeError etc.
  */
 public final class ECMAErrors {
-    private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Messages";
+    private static final String MESSAGES_RESOURCE = "org.openjdk.nashorn.internal.runtime.resources.Messages";
 
     private static final ResourceBundle MESSAGES_BUNDLE;
     static {
@@ -374,7 +374,7 @@ public static ECMAException uriError(final Global global, final Throwable cause,
 
     /**
      * Get the exception message by placing the args in the resource defined
-     * by the resource tag. This is visible to, e.g. the {@link jdk.nashorn.internal.parser.Parser}
+     * by the resource tag. This is visible to, e.g. the {@link org.openjdk.nashorn.internal.parser.Parser}
      * can use it to generate compile time messages with the correct locale
      *
      * @param msgId the resource tag (message id)
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ECMAException.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ECMAException.java
index f906e18f4..56df8dc9e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ECMAException.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualField;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualField;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
+import org.openjdk.nashorn.api.scripting.NashornException;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
 
 /**
  * Exception used to implement ECMAScript "throw" from scripts. The actual thrown
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ErrorManager.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ErrorManager.java
index 4d4c8b161..993b90480 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ErrorManager.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
 
 import java.io.PrintWriter;
-import jdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.Token;
 
 /**
  * Handles JavaScript error reporting.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FinalScriptFunctionData.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FinalScriptFunctionData.java
index 4822be920..732f3fbd3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FinalScriptFunctionData.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FindProperty.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FindProperty.java
index 86d01490a..419ed0d62 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FindProperty.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 
 import java.lang.invoke.MethodHandle;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.objects.Global;
 
 /**
  * This class represents the result from a find property search.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionDocumentation.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionDocumentation.java
index 63ce1138f..b3105ca0a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionDocumentation.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionDocumentation.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -34,7 +34,7 @@
 final class FunctionDocumentation {
     private FunctionDocumentation() {}
 
-    private static final String DOCS_RESOURCE = "jdk.nashorn.internal.runtime.resources.Functions";
+    private static final String DOCS_RESOURCE = "org.openjdk.nashorn.internal.runtime.resources.Functions";
 
     private static final ResourceBundle FUNC_DOCS;
     static {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionInitializer.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionInitializer.java
index a2139ccaf..ff17bc4cb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionInitializer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionInitializer.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -31,10 +31,10 @@
 import java.io.Serializable;
 import java.lang.invoke.MethodType;
 import java.util.Map;
-import jdk.nashorn.internal.codegen.CompileUnit;
-import jdk.nashorn.internal.codegen.FunctionSignature;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.codegen.CompileUnit;
+import org.openjdk.nashorn.internal.codegen.FunctionSignature;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
 
 /**
  * Class that contains information allowing us to look up a method handle implementing a JavaScript function
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionScope.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionScope.java
index 30d06ff85..be6547afa 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/FunctionScope.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 /**
  * This is the base class for function scopes.  Subclasses of this class are
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/GlobalConstants.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/GlobalConstants.java
index e6b19845a..1e215e535 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/GlobalConstants.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCall;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.getProgramPoint;
-import static jdk.nashorn.internal.runtime.logging.DebugLogger.quote;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCall;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.getProgramPoint;
+import static org.openjdk.nashorn.internal.runtime.logging.DebugLogger.quote;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -44,12 +44,12 @@
 import jdk.dynalink.DynamicLinker;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Each context owns one of these. This is basically table of accessors
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/GlobalFunctions.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/GlobalFunctions.java
index 4483885c3..f4dc26f05 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/GlobalFunctions.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSErrorType.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSErrorType.java
index d83d018e2..fc01b99bb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSErrorType.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 /**
  * Native ECMAScript Error types.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSONFunctions.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSONFunctions.java
index 32cdc09d6..af71509a9 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSONFunctions.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.Callable;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.parser.JSONParser;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.parser.JSONParser;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
  * Utilities used by "JSON" object implementation.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSONListAdapter.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSONListAdapter.java
index fde2b4d0d..7338c02cd 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONListAdapter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSONListAdapter.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.objects.Global;
 
 /**
  * A {@link ListAdapter} that also implements {@link JSObject}. Named {@code JSONListAdapter} as it is used as a
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSType.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSType.java
index eb0f67b0f..99074bf8d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/JSType.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -37,15 +37,15 @@
 import java.util.List;
 import jdk.dynalink.SecureLookupSupplier;
 import jdk.dynalink.beans.StaticClass;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.objects.NativeSymbol;
-import jdk.nashorn.internal.parser.Lexer;
-import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
-import jdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.NativeSymbol;
+import org.openjdk.nashorn.internal.parser.Lexer;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
  * Representation for ECMAScript types - this maps directly to the ECMA script standard
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ListAdapter.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ListAdapter.java
index cf40670df..237fd4afa 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ListAdapter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
 import java.util.AbstractList;
@@ -34,10 +34,10 @@
 import java.util.Objects;
 import java.util.RandomAccess;
 import java.util.concurrent.Callable;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
  * An adapter that can wrap any ECMAScript Array-like object (that adheres to the array rules for the property
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NashornLoader.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NashornLoader.java
index cc86b4643..6976c5516 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NashornLoader.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.File;
 import java.io.InputStream;
@@ -46,16 +46,16 @@
  * Superclass for Nashorn class loader classes.
  */
 abstract class NashornLoader extends SecureClassLoader {
-    protected static final String OBJECTS_PKG        = "jdk.nashorn.internal.objects";
-    protected static final String RUNTIME_PKG        = "jdk.nashorn.internal.runtime";
-    protected static final String RUNTIME_ARRAYS_PKG = "jdk.nashorn.internal.runtime.arrays";
-    protected static final String RUNTIME_LINKER_PKG = "jdk.nashorn.internal.runtime.linker";
-    protected static final String SCRIPTS_PKG        = "jdk.nashorn.internal.scripts";
-    protected static final String OBJECTS_PKG_INTERNAL        = "jdk/nashorn/internal/objects";
-    protected static final String RUNTIME_PKG_INTERNAL        = "jdk/nashorn/internal/runtime";
-    protected static final String RUNTIME_ARRAYS_PKG_INTERNAL = "jdk/nashorn/internal/runtime/arrays";
-    protected static final String RUNTIME_LINKER_PKG_INTERNAL = "jdk/nashorn/internal/runtime/linker";
-    protected static final String SCRIPTS_PKG_INTERNAL        = "jdk/nashorn/internal/scripts";
+    protected static final String OBJECTS_PKG        = "org.openjdk.nashorn.internal.objects";
+    protected static final String RUNTIME_PKG        = "org.openjdk.nashorn.internal.runtime";
+    protected static final String RUNTIME_ARRAYS_PKG = "org.openjdk.nashorn.internal.runtime.arrays";
+    protected static final String RUNTIME_LINKER_PKG = "org.openjdk.nashorn.internal.runtime.linker";
+    protected static final String SCRIPTS_PKG        = "org.openjdk.nashorn.internal.scripts";
+    protected static final String OBJECTS_PKG_INTERNAL        = "org/openjdk/nashorn/internal/objects";
+    protected static final String RUNTIME_PKG_INTERNAL        = "org/openjdk/nashorn/internal/runtime";
+    protected static final String RUNTIME_ARRAYS_PKG_INTERNAL = "org/openjdk/nashorn/internal/runtime/arrays";
+    protected static final String RUNTIME_LINKER_PKG_INTERNAL = "org/openjdk/nashorn/internal/runtime/linker";
+    protected static final String SCRIPTS_PKG_INTERNAL        = "org/openjdk/nashorn/internal/scripts";
 
     static final Module NASHORN_MODULE = Context.class.getModule();
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NativeJavaPackage.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NativeJavaPackage.java
index 15234c8b6..689dbde5d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -37,11 +37,11 @@
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.support.Guards;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.lookup.MethodHandleFunctionality;
-import jdk.nashorn.internal.objects.annotations.Attribute;
-import jdk.nashorn.internal.objects.annotations.Function;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFunctionality;
+import org.openjdk.nashorn.internal.objects.annotations.Attribute;
+import org.openjdk.nashorn.internal.objects.annotations.Function;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * An object that exposes Java packages and classes as its properties. Packages are exposed as objects that have further
@@ -56,7 +56,7 @@
  * var ArrayList = java.util.ArrayList
  * var list = new ArrayList
  *
- * You can also use {@link jdk.nashorn.internal.objects.NativeJava#type(Object, Object)} to access Java classes. These two statements are mostly + * You can also use {@link org.openjdk.nashorn.internal.objects.NativeJava#type(Object, Object)} to access Java classes. These two statements are mostly * equivalent: * 
  * var listType1 = java.util.ArrayList
@@ -83,7 +83,7 @@ public final class NativeJavaPackage extends ScriptObject {
     private final String name;
 
     /**
-     * Public constructor to be accessible from {@link jdk.nashorn.internal.objects.Global}
+     * Public constructor to be accessible from {@link org.openjdk.nashorn.internal.objects.Global}
      * @param name  package name
      * @param proto proto
      */
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/OptimisticBuiltins.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/OptimisticBuiltins.java
index 6829ddeb9..7f6b0e1db 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticBuiltins.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/OptimisticBuiltins.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
 
 /**
  * This is an interface for classes that need custom linkage logic. This means Native objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/OptimisticReturnFilters.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/OptimisticReturnFilters.java
index 618da31c1..12b404b39 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/OptimisticReturnFilters.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -35,8 +35,8 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.support.TypeUtilities;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Optimistic return value filters
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ParserException.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ParserException.java
index 696e1d7a2..52c71e35f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ParserException.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.api.scripting.NashornException;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.parser.Token;
 
 /**
  * ECMAScript parser exceptions.
@@ -115,4 +115,3 @@ public void throwAsEcmaException(final Global global) {
         throw ECMAErrors.asEcmaException(global, this);
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Property.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Property.java
index 0fef3cfe2..fbfe6c8c2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Property.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.CONFIGURABLE;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.ENUMERABLE;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.CONFIGURABLE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.ENUMERABLE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
 import java.io.Serializable;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.SwitchPoint;
 import java.util.Objects;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * This is the abstract superclass representing a JavaScript Property.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyAccess.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyAccess.java
index d99a1c9c8..780d37414 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyAccess.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 /**
  * Interface for getting and setting properties from script objects
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyDescriptor.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyDescriptor.java
index e00759ba9..ba902612e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyDescriptor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 /**
  * Describes attributes of a specific property of a script object.
@@ -159,4 +159,3 @@ public interface PropertyDescriptor {
      */
     public boolean hasAndEquals(PropertyDescriptor otherDesc);
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyHashMap.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyHashMap.java
index ba970dd3d..b8b251e37 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyHashMap.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,7 +31,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Immutable hash map implementation for properties. Properties are keyed on strings
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyMap.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyMap.java
index 366263854..bdbeedb8a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertyMap.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.PropertyHashMap.EMPTY_HASHMAP;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.PropertyHashMap.EMPTY_HASHMAP;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -45,8 +45,8 @@
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.atomic.LongAdder;
-import jdk.nashorn.internal.runtime.options.Options;
-import jdk.nashorn.internal.scripts.JO;
+import org.openjdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.scripts.JO;
 
 /**
  * Map of object properties. The PropertyMap is the "template" for JavaScript object
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertySwitchPoints.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertySwitchPoints.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertySwitchPoints.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertySwitchPoints.java
index f279124e9..5cbc4aec5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertySwitchPoints.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PropertySwitchPoints.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.invoke.SwitchPoint;
 import java.util.Collections;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PrototypeObject.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PrototypeObject.java
index f4c1b5f97..c1c2f31cb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PrototypeObject.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/PrototypeObject.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
-import jdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.Global;
 
 /**
  * Instances of this class serve as "prototype" object for script functions.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/QuotedStringTokenizer.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/QuotedStringTokenizer.java
index 3aae7fd23..8fb2021d7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/QuotedStringTokenizer.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.LinkedList;
 import java.util.Stack;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
index 44629604c..17fbffd08 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -46,33 +46,33 @@
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.FunctionSignature;
-import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.codegen.OptimisticTypesPersistence;
-import jdk.nashorn.internal.codegen.TypeMap;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.Block;
-import jdk.nashorn.internal.ir.ForNode;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.LexicalContext;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.SwitchNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TryNode;
-import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.parser.Parser;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.linker.NameCodec;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.Compiler.CompilationPhases;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.FunctionSignature;
+import org.openjdk.nashorn.internal.codegen.Namespace;
+import org.openjdk.nashorn.internal.codegen.OptimisticTypesPersistence;
+import org.openjdk.nashorn.internal.codegen.TypeMap;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.ir.Block;
+import org.openjdk.nashorn.internal.ir.ForNode;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.IdentNode;
+import org.openjdk.nashorn.internal.ir.LexicalContext;
+import org.openjdk.nashorn.internal.ir.Node;
+import org.openjdk.nashorn.internal.ir.SwitchNode;
+import org.openjdk.nashorn.internal.ir.Symbol;
+import org.openjdk.nashorn.internal.ir.TryNode;
+import org.openjdk.nashorn.internal.ir.visitor.SimpleNodeVisitor;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.parser.Parser;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.parser.TokenType;
+import org.openjdk.nashorn.internal.runtime.linker.NameCodec;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 /**
  * This is a subclass that represents a script function that may be regenerated,
  * for example with specialization based on call site types, or lazily generated.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/RewriteException.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/RewriteException.java
index 690d7005b..0630e3c0c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/RewriteException.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
 
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
@@ -39,13 +39,13 @@
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Array;
 import java.util.Arrays;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.lookup.MethodHandleFunctionality;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFunctionality;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Used to signal to the linker to relink the callee
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Scope.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Scope.java
index 9650f9cd9..dcb140948 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Scope.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
 
 import java.util.concurrent.atomic.LongAdder;
-import jdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
 
 /**
  * A {@link ScriptObject} subclass for objects that act as scope.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptEnvironment.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptEnvironment.java
index 16d95255b..0a9d6f943 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptEnvironment.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
@@ -33,13 +33,13 @@
 import java.util.StringTokenizer;
 import java.util.TimeZone;
 import java.util.logging.Level;
-import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.options.KeyValueOption;
-import jdk.nashorn.internal.runtime.options.LoggingOption;
-import jdk.nashorn.internal.runtime.options.LoggingOption.LoggerInfo;
-import jdk.nashorn.internal.runtime.options.Option;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.codegen.Namespace;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.options.KeyValueOption;
+import org.openjdk.nashorn.internal.runtime.options.LoggingOption;
+import org.openjdk.nashorn.internal.runtime.options.LoggingOption.LoggerInfo;
+import org.openjdk.nashorn.internal.runtime.options.Option;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Script environment consists of command line options, arguments, script files
@@ -108,8 +108,6 @@ public final class ScriptEnvironment {
     /** Enable experimental ECMAScript 6 features. */
     public final boolean _es6;
 
-    /** do not show deprecation warning for nashorn engine and jjs usage. */
-    public final boolean _no_deprecation_warning;
 
     /** Number of times a dynamic call site has to be relinked before it is
      * considered unstable (and thus should be linked as if it were megamorphic).
@@ -308,7 +306,6 @@ public ScriptEnvironment(final Options options, final PrintWriter out, final Pri
         _strict               = options.getBoolean("strict");
         _version              = options.getBoolean("version");
         _verify_code          = options.getBoolean("verify.code");
-        _no_deprecation_warning = options.getBoolean("no.deprecation.warning");
 
         final int configuredUrt = options.getInteger("unstable.relink.threshold");
         // The default for this property is -1, so we can easily detect when
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptFunction.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptFunction.java
index 1c926afaa..20b06eb7c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptFunction.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -50,16 +50,16 @@
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.support.Guards;
-import jdk.nashorn.internal.codegen.ApplySpecialization;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.objects.NativeFunction;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.codegen.ApplySpecialization;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.NativeFunction;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
 
 /**
  * Runtime representation of a JavaScript function. This class has only private
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptFunctionData.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptFunctionData.java
index 0b54a34fc..4508c9952 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -38,7 +38,7 @@
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.openjdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
 
 /**
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptLoader.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptLoader.java
index d0e0ca148..dd6dfe008 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptLoader.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleDescriptor.Modifier;
@@ -36,7 +36,7 @@
  *
  */
 final class ScriptLoader extends NashornLoader {
-    private static final String NASHORN_PKG_PREFIX = "jdk.nashorn.internal.";
+    private static final String NASHORN_PKG_PREFIX = "org.openjdk.nashorn.internal.";
 
     private volatile boolean structureAccessAdded;
     private final Context context;
@@ -54,7 +54,7 @@ final class ScriptLoader extends NashornLoader {
         this.context = context;
 
         // new scripts module, it's specific exports and read-edges
-        scriptModule = createModule("jdk.scripting.nashorn.scripts");
+        scriptModule = createModule("org.openjdk.nashorn.scripts");
 
         // specific exports from nashorn to new scripts module
         NASHORN_MODULE.addExports(OBJECTS_PKG, scriptModule);
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptObject.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptObject.java
index ebc1eeb75..c909d4af0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptObject.java
@@ -23,30 +23,30 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
-
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCall;
-import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.UNDEFINED_DOUBLE;
-import static jdk.nashorn.internal.runtime.JSType.UNDEFINED_INT;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.CONFIGURABLE;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.ENUMERABLE;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.GET;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.SET;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
-import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
-import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.isScopeFlag;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.isStrictFlag;
-import static jdk.nashorn.internal.runtime.linker.NashornGuards.explicitInstanceOfCheck;
+package org.openjdk.nashorn.internal.runtime;
+
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.UNDEFINED_DOUBLE;
+import static org.openjdk.nashorn.internal.runtime.JSType.UNDEFINED_INT;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.CONFIGURABLE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.ENUMERABLE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.GET;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.SET;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
+import static org.openjdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.isScopeFlag;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.isStrictFlag;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornGuards.explicitInstanceOfCheck;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -69,19 +69,19 @@
 import jdk.dynalink.NamedOperation;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.objects.AccessorPropertyDescriptor;
-import jdk.nashorn.internal.objects.DataPropertyDescriptor;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuards;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.objects.AccessorPropertyDescriptor;
+import org.openjdk.nashorn.internal.objects.DataPropertyDescriptor;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayData;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.linker.NashornGuards;
 
 /**
  * Base class for generic JavaScript objects.
@@ -772,11 +772,11 @@ public final void addOwnProperty(final Object key, final PropertyDescriptor prop
      * 

      * Find a property in the prototype hierarchy. Note: this is final and not
      * a good idea to override. If you have to, use
-     * {jdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
-     * {jdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
+     * {org.openjdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
+     * {org.openjdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
      * overriding way to find array properties
      *
-     * @see jdk.nashorn.internal.objects.NativeArray
+     * @see org.openjdk.nashorn.internal.objects.NativeArray
      *
      * @param key  Property key.
      * @param deep Whether the search should look up proto chain.
@@ -793,11 +793,11 @@ public final FindProperty findProperty(final Object key, final boolean deep) {
      * Find a property in the prototype hierarchy. Note: this is not a good idea
      * to override except as it was done in {@link WithObject}.
      * If you have to, use
-     * {jdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
-     * {jdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
+     * {org.openjdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
+     * {org.openjdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
      * overriding way to find array properties
      *
-     * @see jdk.nashorn.internal.objects.NativeArray
+     * @see org.openjdk.nashorn.internal.objects.NativeArray
      *
      * @param key  Property key.
      * @param deep true if the search should look up proto chain
@@ -1153,7 +1153,7 @@ public final Property getProperty(final String key) {
     }
 
     /**
-     * Overridden by {@link jdk.nashorn.internal.objects.NativeArguments} class (internal use.)
+     * Overridden by {@link org.openjdk.nashorn.internal.objects.NativeArguments} class (internal use.)
      * Used for argument access in a vararg function using parameter name.
      * Returns the argument at a given key (index)
      *
@@ -1166,7 +1166,7 @@ public Object getArgument(final int key) {
     }
 
     /**
-     * Overridden by {@link jdk.nashorn.internal.objects.NativeArguments} class (internal use.)
+     * Overridden by {@link org.openjdk.nashorn.internal.objects.NativeArguments} class (internal use.)
      * Used for argument access in a vararg function using parameter name.
      * Returns the argument at a given key (index)
      *
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptRuntime.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptRuntime.java
index d82e03bb9..d2bc6d6d3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.syntaxError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
-import static jdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.syntaxError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -47,21 +47,21 @@
 import java.util.Objects;
 import jdk.dynalink.beans.BeansLinker;
 import jdk.dynalink.beans.StaticClass;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.codegen.ApplySpecialization;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.ir.debug.JSONWriter;
-import jdk.nashorn.internal.objects.AbstractIterator;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.objects.NativeObject;
-import jdk.nashorn.internal.objects.NativeJava;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.parser.Lexer;
-import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.InvokeByName;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.codegen.ApplySpecialization;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.ir.debug.JSONWriter;
+import org.openjdk.nashorn.internal.objects.AbstractIterator;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.NativeObject;
+import org.openjdk.nashorn.internal.objects.NativeJava;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.parser.Lexer;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.InvokeByName;
 
 /**
  * Utilities to be called by JavaScript runtime API and generated classes.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptingFunctions.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptingFunctions.java
index c7642011a..030e12633 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -44,8 +44,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
-import jdk.nashorn.internal.objects.NativeArray;
-import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.rangeError;
 
 /**
  * Global functions supported only in scripting mode.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SetMethodCreator.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SetMethodCreator.java
index a71efb117..fc9af449e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
-import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static org.openjdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.SwitchPoint;
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuards;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.linker.NashornGuards;
 
 /**
  * Instances of this class are quite ephemeral; they only exist for the duration of an invocation of
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SharedPropertyMap.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SharedPropertyMap.java
index 39f02e650..4fd05d7ac 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SharedPropertyMap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SharedPropertyMap.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.invoke.SwitchPoint;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Source.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Source.java
index a1d04721f..0c4ca96ee 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Source.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -52,11 +52,11 @@
 import java.util.Base64;
 import java.util.Objects;
 import java.util.WeakHashMap;
-import jdk.nashorn.api.scripting.URLReader;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.api.scripting.URLReader;
+import org.openjdk.nashorn.internal.parser.Token;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 /**
  * Source objects track the origin of JavaScript entities.
  */
@@ -745,7 +745,7 @@ public String getSourceLine(final int position) {
      * Get the content of this source as a char array. Note that the underlying array is returned instead of a
      * clone; modifying the char array will cause modification to the source; this should not be done. While
      * there is an apparent danger that we allow unfettered access to an underlying mutable array, the
-     * {@code Source} class is in a restricted {@code jdk.nashorn.internal.*} package and as such it is
+     * {@code Source} class is in a restricted {@code org.openjdk.nashorn.internal.*} package and as such it is
      * inaccessible by external actors in an environment with a security manager. Returning a clone would be
      * detrimental to performance.
      * @return content the content of this source as a char array
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Specialization.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Specialization.java
index 0a037695e..20d2a00a1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Specialization.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Specialization.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import org.openjdk.nashorn.internal.objects.annotations.SpecializedFunction.LinkLogic;
 
 /**
  * Specialization info for a {@link SpecializedFunction}
@@ -126,4 +126,3 @@ public boolean convertsNumericArgs() {
     }
 
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SpillProperty.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SpillProperty.java
index ec197ed77..2b8fae027 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/SpillProperty.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StoredScript.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StoredScript.java
index 07419d714..04813d797 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StoredScript.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StoredScript.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StructureLoader.java
similarity index 88%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StructureLoader.java
index f1c9ef315..164330ae2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/StructureLoader.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
-import static jdk.nashorn.internal.codegen.Compiler.binaryName;
-import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_DUAL_FIELD_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_SINGLE_FIELD_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
+import static org.openjdk.nashorn.internal.codegen.Compiler.binaryName;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_DUAL_FIELD_PREFIX;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_SINGLE_FIELD_PREFIX;
 
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleDescriptor.Modifier;
 import java.security.ProtectionDomain;
 import java.util.Set;
-import jdk.nashorn.internal.codegen.ObjectClassGenerator;
+import org.openjdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * Responsible for on the fly construction of structure classes.
@@ -52,7 +52,7 @@ final class StructureLoader extends NashornLoader {
         super(parent);
 
         // new structures module, it's exports, read edges
-        structuresModule = createModule("jdk.scripting.nashorn.structures");
+        structuresModule = createModule("org.openjdk.nashorn.structures");
 
         // specific exports from nashorn to the structures module
         NASHORN_MODULE.addExports(SCRIPTS_PKG, structuresModule);
@@ -69,7 +69,7 @@ private Module createModule(final String moduleName) {
                             .packages(Set.of(SCRIPTS_PKG))
                             .build();
 
-        final Module mod = Context.createModuleTrusted(descriptor, this);
+        final Module mod = Context.createModuleTrusted(NASHORN_MODULE.getLayer(), descriptor, this);
         loadModuleManipulator();
         return mod;
     }
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Symbol.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Symbol.java
index f8a85d63f..2d817f667 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Symbol.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Symbol.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.Serializable;
-import jdk.nashorn.internal.objects.NativeSymbol;
+import org.openjdk.nashorn.internal.objects.NativeSymbol;
 
 /**
  * This class represents a unique, non-String Object property key as defined in ECMAScript 6.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Timing.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Timing.java
index 1950bd904..0bd6d07d0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Timing.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -36,10 +36,10 @@
 import java.util.concurrent.atomic.LongAdder;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import jdk.nashorn.internal.codegen.CompileUnit;
-import jdk.nashorn.internal.runtime.logging.DebugLogger;
-import jdk.nashorn.internal.runtime.logging.Loggable;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.codegen.CompileUnit;
+import org.openjdk.nashorn.internal.runtime.logging.DebugLogger;
+import org.openjdk.nashorn.internal.runtime.logging.Loggable;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Simple wallclock timing framework
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/URIUtils.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/URIUtils.java
index 2321353fb..05ee9c8bf 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/URIUtils.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.uriError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.uriError;
 
 /**
  * URI handling global functions. ECMA 15.1.3 URI Handling Function Properties
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Undefined.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Undefined.java
index 5cb460d76..0d1430378 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Undefined.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -34,7 +34,7 @@
 import jdk.dynalink.NamedOperation;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.support.Guards;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Unique instance of this class is used to represent JavaScript undefined.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
index f9deaf0fc..f1973e2c4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/UnwarrantedOptimismException.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import jdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.codegen.types.Type;
 
 /**
  * This exception is thrown from an optimistic operation, e.g. an integer add,
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/UserAccessorProperty.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/UserAccessorProperty.java
index 502e9dca8..81e4a1ee3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/UserAccessorProperty.java
@@ -23,20 +23,20 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
+package org.openjdk.nashorn.internal.runtime;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_PROGRAM_POINT_SHIFT;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.concurrent.Callable;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 
 /**
  * Property with user defined getters/setters. Actual getter and setter
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Version.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Version.java
index 8cf6a449f..d4359ee01 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/Version.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -52,7 +52,7 @@ public static String fullVersion() {
         return version("version_string"); // E.g. "9.1.2.3-ea-4+nashorn-testing"
     }
 
-    private static final String   VERSION_RB_NAME = "jdk.nashorn.internal.runtime.resources.version";
+    private static final String   VERSION_RB_NAME = "org.openjdk.nashorn.internal.runtime.resources.version";
     private static ResourceBundle versionRB;
 
     private static String version(final String key) {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/WithObject.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/WithObject.java
index f958bf8fe..32ef0ffe2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/WithObject.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package org.openjdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -38,10 +38,10 @@
 import jdk.dynalink.StandardOperation;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.api.scripting.AbstractJSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuards;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.linker.NashornGuards;
 
 /**
  * This class supports the handling of scope in a with body.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/AnyElements.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/AnyElements.java
index d9e019230..227001324 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/AnyElements.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/AnyElements.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 /**
  * Marker interface for any ContinuousArray with any elements
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayData.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayData.java
index 250dbe58d..1f3a1ccef 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayData.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -37,13 +37,13 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 
 /**
  * ArrayData - abstraction for wrapping array elements
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayFilter.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayFilter.java
index 47e64549e..915b2b1aa 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayFilter.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Undefined;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
  * Base class for array filters. Implements all core routines so that the
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayIndex.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayIndex.java
index f979aaa9a..9cfa3b0d0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayIndex.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Array index computation helpers. that both throw exceptions or return
@@ -205,4 +205,3 @@ public static String toKey(final int index) {
     }
 
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
index 962b1f9e0..24d83ef7d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.Iterator;
 import java.util.List;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Superclass for array iterators
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
index 2b0326577..6dd25da38 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.nio.ByteBuffer;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Implementation of {@link ArrayData} that wraps a nio ByteBuffer
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
index f891afad4..d59930cdb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java
@@ -22,13 +22,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.JSType.getAccessorTypeIndex;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.INVALID_PROGRAM_POINT;
+import static org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -36,11 +36,11 @@
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.lookup.Lookup;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.logging.Logger;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.openjdk.nashorn.internal.runtime.logging.Logger;
 
 /**
  * Interface implemented by all arrays that are directly accessible as underlying
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
index 62e1ced87..df75ef37f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import java.lang.reflect.Array;
-import jdk.nashorn.internal.runtime.BitVector;
+import org.openjdk.nashorn.internal.runtime.BitVector;
 
 /**
  * This filter handles the deletion of array elements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
index d4710318d..f6bb84b20 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.lang.reflect.Array;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * This filter handles the deletion of array elements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
index e94f8cf36..452d089c8 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.NoSuchElementException;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
index 40d4ff108..64d7a9d61 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * ArrayData after the array has been frozen by Object.freeze call.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntArrayData.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntArrayData.java
index 03a6545f0..88a9f78be 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntArrayData.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Implementation of {@link ArrayData} as soon as an int has been
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntElements.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntElements.java
index 5bd268432..d4f7d59e5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntElements.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntElements.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 /**
  * Marker interface for any ContinuousArray with int elements
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntOrLongElements.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntOrLongElements.java
index f176d7575..a3633c3a3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntOrLongElements.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IntOrLongElements.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 /**
  * Marker interface for any ContinuousArray with int or long elements
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IteratorAction.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IteratorAction.java
index a1114ae73..e72263dd7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/IteratorAction.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
 
 /**
- * Helper class for the various map/apply functions in {@link jdk.nashorn.internal.objects.NativeArray}.
+ * Helper class for the various map/apply functions in {@link org.openjdk.nashorn.internal.objects.NativeArray}.
  * @param  element type of results from application callback
  */
 public abstract class IteratorAction {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
index 885c77eb5..7e4532541 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.NoSuchElementException;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 /**
  * Iterator over a ScriptObjectMirror
@@ -78,4 +78,3 @@ public Object next() {
         throw new NoSuchElementException();
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
index a6b6bb9a4..77cdcccf6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.lang.reflect.Array;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JavaListIterator.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JavaListIterator.java
index 96a8b25b6..97cf659a6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/JavaListIterator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.List;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java
index 19e3e163d..3c63bee22 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/LengthNotWritableFilter.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Filter to use for ArrayData where the length is not writable.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java
index 8928a1c44..8a164866c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NonExtensibleArrayFilter.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Filter class that wrap arrays that have been tagged non extensible
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NumberArrayData.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NumberArrayData.java
index 3804e320e..152fd2b78 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NumberArrayData.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import jdk.dynalink.linker.support.TypeUtilities;
-import jdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 /**
  * Implementation of {@link ArrayData} as soon as a double has been
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NumericElements.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NumericElements.java
index cb87ea911..06fcdcadf 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumericElements.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/NumericElements.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 /**
  * Marker interface for any ContinuousArray with numeric elements
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
index 027bd6b0a..05ae3ced5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.specialCall;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Implementation of {@link ArrayData} as soon as an Object has been
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
index 84c5c46dd..159e34883 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 /**
  * Reverse iterator over a ScriptObjectMirror
@@ -53,4 +53,3 @@ protected long bumpIndex() {
         return index--;
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
index b90bae68c..52a312340 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.lang.reflect.Array;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
index 390858bc8..7baddaaa2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.List;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
index fae1a8ffd..be649dc2f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Reverse iterator over a NativeArray
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
index 533104db9..9e6977d5d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Reverse iterator over a map
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
index 0a6178150..e07e49be1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Iterator over a NativeArray
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
index 73b4c1f5a..2f0d88861 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.NoSuchElementException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Iterator over a map
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
index 67efe47a5..c8c6af77e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.PropertyDescriptor;
 
 /**
  * ArrayData after the array has been sealed by Object.seal call.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/SparseArrayData.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/SparseArrayData.java
index 5ea891058..386e56b52 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/SparseArrayData.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
 import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Handle arrays where the index is very large.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/TypedArrayData.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/TypedArrayData.java
index 60a5b9312..73a519454 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/TypedArrayData.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 import java.lang.invoke.MethodHandle;
 import java.nio.Buffer;
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.lookup.Lookup;
+import org.openjdk.nashorn.internal.lookup.Lookup;
 
 /**
  * The superclass of all ArrayData used by TypedArrays
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
index c6b1bd9db..429b4704c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.arrays;
+package org.openjdk.nashorn.internal.runtime.arrays;
 
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import java.lang.reflect.Array;
-import jdk.nashorn.internal.runtime.BitVector;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.runtime.BitVector;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 
 /**
  * This filter handles the presence of undefined array elements.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/Bignum.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/Bignum.java
index 181d76fa0..86f8bcc2c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/Bignum.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/Bignum.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 import java.util.Arrays;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java
index a5832348f..222e41397 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/BignumDtoa.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 // Dtoa implementation based on our own Bignum implementation, supporting
 // all conversion modes but slightly slower than the specialized implementations.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/CachedPowers.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/CachedPowers.java
index 49b07005d..332ba6890 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/CachedPowers.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/CachedPowers.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 public class CachedPowers {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DiyFp.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DiyFp.java
index fc61cdbbe..2d0521421 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DiyFp.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DiyFp.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 // This "Do It Yourself Floating Point" class implements a floating-point number
 // with a uint64 significand and an int exponent. Normalized DiyFp numbers will
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java
index 9bc403f23..b7634609e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DoubleConversion.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 /**
  * This class provides the public API for the double conversion package.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java
index 98f39c3a4..a03b3e997 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DtoaBuffer.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 /**
  * A buffer for generating string representations of doubles.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DtoaMode.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DtoaMode.java
index 0f3f16f9a..4f1d378c6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/DtoaMode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/DtoaMode.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 /**
  * This defines the string conversion modes supported by this package.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/FastDtoa.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/FastDtoa.java
index b243abda3..bf21f0f3f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FastDtoa.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/FastDtoa.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 // Fast Dtoa implementation supporting shortest and precision modes. Does not
 // work for all numbers so BugnumDtoa is used as fallback.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java
index 4a00177c2..c2a148a30 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/FixedDtoa.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 class FixedDtoa {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java
index a381955d8..196dbf14e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/doubleconv/IeeeDouble.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv;
+package org.openjdk.nashorn.internal.runtime.doubleconv;
 
 // Helper functions for doubles.
 class IeeeDouble {
@@ -229,5 +229,3 @@ static double NaN() {
     }
 
 }
-
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/events/RecompilationEvent.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/events/RecompilationEvent.java
index 8b2ff4713..5fdbf6239 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/events/RecompilationEvent.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.events;
+package org.openjdk.nashorn.internal.runtime.events;
 
 import java.util.logging.Level;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
-import jdk.nashorn.internal.runtime.RewriteException;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.RecompilableScriptFunctionData;
+import org.openjdk.nashorn.internal.runtime.RewriteException;
 
 /**
  * Subclass of runtime event for {@link RewriteException}. In order not
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/events/RuntimeEvent.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/events/RuntimeEvent.java
index 29a3714af..0381c4018 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/events/RuntimeEvent.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.events;
+package org.openjdk.nashorn.internal.runtime.events;
 
 import java.util.logging.Level;
-import jdk.nashorn.internal.objects.NativeDebug;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.objects.NativeDebug;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Class for representing a runtime event, giving less global dependencies than logger.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/AdaptationException.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/AdaptationException.java
index aa29e99ff..4bad533e6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/AdaptationException.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 @SuppressWarnings("serial")
 final class AdaptationException extends Exception {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/AdaptationResult.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/AdaptationResult.java
index cb3d56e2c..207e17abe 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/AdaptationResult.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
 
 /**
  * A result of generating an adapter for a class. A tuple of an outcome and - in case of an error outcome - a list of
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/Bootstrap.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/Bootstrap.java
index 868b3b690..000a0d92d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
@@ -47,16 +47,16 @@
 import jdk.dynalink.linker.MethodTypeConversionStrategy;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.dynalink.linker.support.TypeUtilities;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.lookup.MethodHandleFunctionality;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.OptimisticReturnFilters;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFunctionality;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.OptimisticReturnFilters;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * This class houses bootstrap method for invokedynamic instructions generated by compiler.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BoundCallable.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BoundCallable.java
index a0eee0de5..a64fb4856 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallable.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BoundCallable.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import java.util.Arrays;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Represents a Nashorn callable bound to a receiver and optionally arguments. Note that objects of this class
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BoundCallableLinker.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BoundCallableLinker.java
index 673ae0523..0de58113f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BoundCallableLinker.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java
index 3578ed80b..27139a605 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/BrowserJSObjectLinker.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.JSType.isString;
-import static jdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_CALL;
-import static jdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_GETMEMBER;
-import static jdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_GETSLOT;
-import static jdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_SETMEMBER;
-import static jdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_SETSLOT;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_CALL;
+import static org.openjdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_GETMEMBER;
+import static org.openjdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_GETSLOT;
+import static org.openjdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_SETMEMBER;
+import static org.openjdk.nashorn.internal.runtime.linker.BrowserJSObjectLinker.JSObjectHandles.JSOBJECT_SETSLOT;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -39,9 +39,9 @@
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.lookup.MethodHandleFunctionality;
-import jdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFunctionality;
+import org.openjdk.nashorn.internal.runtime.JSType;
 
 /**
  * A Dynalink linker to handle web browser built-in JS (DOM etc.) objects.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/ClassAndLoader.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/ClassAndLoader.java
index 6a3d933f8..74ff0dec5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/ClassAndLoader.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.security.AccessControlContext;
 import java.security.AccessController;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/InvokeByName.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/InvokeByName.java
index d4dad62e8..fbb72dc87 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/InvokeByName.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import java.lang.invoke.MethodHandle;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JSObjectLinker.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JSObjectLinker.java
index eeb6edd3d..4f0081bf1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JSObjectLinker.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -39,14 +39,14 @@
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.lookup.MethodHandleFactory;
-import jdk.nashorn.internal.lookup.MethodHandleFunctionality;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFactory;
+import org.openjdk.nashorn.internal.lookup.MethodHandleFunctionality;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.Global;
 
 /**
  * A Dynalink linker to handle web browser built-in JS (DOM etc.) objects as well
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
index 124c4f498..80571d51b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
@@ -23,33 +23,34 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
-
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_VARARGS;
-import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE;
-import static jdk.internal.org.objectweb.asm.Opcodes.D2F;
-import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.I2B;
-import static jdk.internal.org.objectweb.asm.Opcodes.I2S;
-import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
-import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome.ERROR_NO_ACCESSIBLE_CONSTRUCTOR;
-
+package org.openjdk.nashorn.internal.runtime.linker;
+
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+import static org.objectweb.asm.Opcodes.ACC_SUPER;
+import static org.objectweb.asm.Opcodes.ACC_VARARGS;
+import static org.objectweb.asm.Opcodes.ALOAD;
+import static org.objectweb.asm.Opcodes.ASTORE;
+import static org.objectweb.asm.Opcodes.D2F;
+import static org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.I2B;
+import static org.objectweb.asm.Opcodes.I2S;
+import static org.objectweb.asm.Opcodes.RETURN;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
+import static org.openjdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome.ERROR_NO_ACCESSIBLE_CONSTRUCTOR;
+
+import java.lang.annotation.Annotation;
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
-import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.security.AccessControlContext;
@@ -62,19 +63,18 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Handle;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.commons.InstructionAdapter;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.api.scripting.ScriptUtils;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome;
-import jdk.internal.reflect.CallerSensitive;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Handle;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.InstructionAdapter;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptUtils;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome;
 
 /**
  * Generates bytecode for a Java adapter class. Used by the {@link JavaAdapterFactory}.
@@ -203,7 +203,7 @@ final class JavaAdapterBytecodeGenerator {
     private static final String GET_METHOD_PROPERTY_METHOD_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE, SCRIPT_OBJECT_TYPE);
     private static final String VOID_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE);
 
-    private static final String ADAPTER_PACKAGE_INTERNAL = "jdk/nashorn/javaadapters/";
+    private static final String ADAPTER_PACKAGE_INTERNAL = "org/openjdk/nashorn/javaadapters/";
     private static final int MAX_GENERATED_TYPE_NAME_LENGTH = 255;
 
     // Method name prefix for invoking super-methods
@@ -213,6 +213,8 @@ final class JavaAdapterBytecodeGenerator {
     private static final String FINALIZER_DELEGATE_NAME = "$$nashornFinalizerDelegate";
     private static final String FINALIZER_DELEGATE_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE, OBJECT_TYPE);
 
+    private static final String CALLER_SENSITIVE_CLASS_NAME = "jdk.internal.reflect.CallerSensitive";
+
     /**
      * Collection of methods we never override: Object.clone(), Object.finalize().
      */
@@ -1227,8 +1229,13 @@ private static Class assignableSuperClass(final Class c1, final Class c
         return superClass.isAssignableFrom(c2) ? superClass : assignableSuperClass(superClass, c2);
     }
 
-    private static boolean isCallerSensitive(final AccessibleObject e) {
-        return e.isAnnotationPresent(CallerSensitive.class);
+    private static boolean isCallerSensitive(final Executable e) {
+        for (final Annotation ann: e.getAnnotations()) {
+            if (CALLER_SENSITIVE_CLASS_NAME.equals(ann.annotationType().getName())) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private static Call lookupServiceMethod(final String name, final Class rtype, final Class... ptypes) {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
index 06f035c4b..a847d02db 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -38,11 +38,11 @@
 import java.util.HashSet;
 import java.util.Set;
 import jdk.dynalink.beans.StaticClass;
-import jdk.nashorn.internal.codegen.DumpBytecode;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.codegen.DumpBytecode;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * This class encapsulates the bytecode of the adapter class and can be used to load it into the JVM as an actual Class.
@@ -104,8 +104,8 @@ private ClassLoader createClassLoader(final ClassLoader parentLoader, final Prot
 
             {
                 // specific exports from nashorn to the new adapter module
-                NASHORN_MODULE.addExports("jdk.nashorn.internal.runtime", adapterModule);
-                NASHORN_MODULE.addExports("jdk.nashorn.internal.runtime.linker", adapterModule);
+                NASHORN_MODULE.addExports("org.openjdk.nashorn.internal.runtime", adapterModule);
+                NASHORN_MODULE.addExports("org.openjdk.nashorn.internal.runtime.linker", adapterModule);
 
                 // nashorn should be be able to read methods of classes loaded in adapter module
                 NASHORN_MODULE.addReads(adapterModule);
@@ -143,7 +143,7 @@ public Context run() {
                             return Context.getContext();
                         }
                     }, GET_CONTEXT_ACC_CTXT);
-                    DumpBytecode.dumpBytecode(ctx.getEnv(), ctx.getLogger(jdk.nashorn.internal.codegen.Compiler.class), classBytes, name);
+                    DumpBytecode.dumpBytecode(ctx.getEnv(), ctx.getLogger(org.openjdk.nashorn.internal.codegen.Compiler.class), classBytes, name);
                     return defineClass(name, classBytes, 0, classBytes.length, protectionDomain);
                 }
                 throw new ClassNotFoundException(name);
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 00fcb7eff..7084f0941 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -50,11 +50,11 @@
 import jdk.dynalink.StandardOperation;
 import jdk.dynalink.beans.StaticClass;
 import jdk.dynalink.linker.support.SimpleLinkRequest;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome;
 
 /**
  * A factory class that generates adapter classes. Adapter classes allow
@@ -75,9 +75,9 @@
  * itself; see its documentation for details about the generated class.
  * 

  * You normally don't use this class directly, but rather either create adapters
- * from script using {@link jdk.nashorn.internal.objects.NativeJava#extend(Object, Object...)},
+ * from script using {@link org.openjdk.nashorn.internal.objects.NativeJava#extend(Object, Object...)},
  * using the {@code new} operator on abstract classes and interfaces (see
- * {@link jdk.nashorn.internal.objects.NativeJava#type(Object, Object)}), or
+ * {@link org.openjdk.nashorn.internal.objects.NativeJava#type(Object, Object)}), or
  * implicitly when passing script functions to Java methods expecting SAM types.
  */
 
@@ -88,7 +88,7 @@ public final class JavaAdapterFactory {
     // context with permissions needs for AdapterInfo creation
     private static final AccessControlContext CREATE_ADAPTER_INFO_ACC_CTXT =
         ClassAndLoader.createPermAccCtxt("createClassLoader", "getClassLoader",
-            "accessDeclaredMembers", "accessClassInPackage.jdk.nashorn.internal.runtime");
+            "accessDeclaredMembers", "accessClassInPackage.org.openjdk.nashorn.internal.runtime");
 
     /**
      * A mapping from an original Class object to AdapterInfo representing the adapter for the class it represents.
@@ -380,8 +380,8 @@ private static ClassLoader findCommonLoader(final ClassAndLoader classAndLoader)
     private static ProtectionDomain createMinimalPermissionDomain() {
         // Generated classes need to have at least the permission to access Nashorn runtime and runtime.linker packages.
         final Permissions permissions = new Permissions();
-        permissions.add(new RuntimePermission("accessClassInPackage.jdk.nashorn.internal.runtime"));
-        permissions.add(new RuntimePermission("accessClassInPackage.jdk.nashorn.internal.runtime.linker"));
+        permissions.add(new RuntimePermission("accessClassInPackage.org.openjdk.nashorn.internal.runtime"));
+        permissions.add(new RuntimePermission("accessClassInPackage.org.openjdk.nashorn.internal.runtime.linker"));
         return new ProtectionDomain(new CodeSource(null, (CodeSigner[])null), permissions);
     }
 }
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
similarity index 92%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
index 346d66cc5..7e10da73f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
-import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
-import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
-import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+import static org.objectweb.asm.Opcodes.ACC_SUPER;
+import static org.objectweb.asm.Opcodes.ALOAD;
+import static org.objectweb.asm.Opcodes.RETURN;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.CallSite;
 import java.lang.invoke.ConstantCallSite;
@@ -48,18 +48,18 @@
 import java.security.ProtectionDomain;
 import java.security.SecureClassLoader;
 import java.util.Objects;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.org.objectweb.asm.commons.InstructionAdapter;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.InstructionAdapter;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Provides static utility services to generated Java adapter classes.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index bc157b844..737c4e181 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.JSType.isString;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.JSType.isString;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.Map;
 import jdk.dynalink.linker.support.TypeUtilities;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Utility class shared by {@code NashornLinker} and {@code NashornPrimitiveLinker} for converting JS values to Java
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
index 6cc2a1b0f..584dca9d4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import java.util.Objects;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
index 8d525a713..aca2ff3ae 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import static jdk.dynalink.StandardNamespace.METHOD;
 import static jdk.dynalink.StandardOperation.GET;
-import static jdk.nashorn.internal.runtime.linker.JavaAdapterBytecodeGenerator.SUPER_PREFIX;
+import static org.openjdk.nashorn.internal.runtime.linker.JavaAdapterBytecodeGenerator.SUPER_PREFIX;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -40,7 +40,7 @@
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.dynalink.linker.support.Lookup;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * A linker for instances of {@code JavaSuperAdapter}. Only links {@code getMethod} calls, by forwarding them to the
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/LinkerCallSite.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index 55ed42398..92e15cf8e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -47,11 +47,11 @@
 import jdk.dynalink.DynamicLinker;
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.support.ChainedCallSite;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Debug;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 
 /**
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NameCodec.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NameCodec.java
index 1b701d59f..0c7120167 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NameCodec.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NameCodec.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 /**
  * 

diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
index b85c6e491..7f45a067a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -49,11 +49,11 @@
 import jdk.dynalink.linker.support.DefaultInternalObjectFilter;
 import jdk.dynalink.linker.support.Lookup;
 import jdk.dynalink.linker.support.SimpleLinkRequest;
-import jdk.nashorn.api.scripting.ScriptUtils;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.api.scripting.ScriptUtils;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This linker delegates to a {@code BeansLinker} but passes it a special linker services object that has a modified
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index 481919317..1048cb109 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -47,11 +47,11 @@
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.support.Guards;
 import jdk.dynalink.linker.support.Lookup;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.internal.codegen.types.Type;
+import org.openjdk.nashorn.internal.runtime.ECMAException;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 
 /**
  * Nashorn bottom linker; used as a last-resort catch-all linker for all linking requests that fall through all other
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
index 28db284c0..faddd885f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import static jdk.dynalink.StandardNamespace.ELEMENT;
 import static jdk.dynalink.StandardNamespace.METHOD;
@@ -53,9 +53,9 @@
 import jdk.dynalink.SecureLookupSupplier;
 import jdk.dynalink.StandardNamespace;
 import jdk.dynalink.StandardOperation;
-import jdk.nashorn.internal.ir.debug.NashornTextifier;
-import jdk.nashorn.internal.runtime.AccessControlContextFactory;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.ir.debug.NashornTextifier;
+import org.openjdk.nashorn.internal.runtime.AccessControlContextFactory;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Nashorn-specific implementation of Dynalink's {@link CallSiteDescriptor}.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornGuards.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornGuards.java
index 19f8adb29..58b525380 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornGuards.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 import jdk.dynalink.CallSiteDescriptor;
 import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Constructor of method handles used to guard call sites.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornLinker.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornLinker.java
index 5f6f72c61..a34df652c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -51,17 +51,17 @@
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.dynalink.linker.support.Guards;
 import jdk.dynalink.linker.support.Lookup;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.api.scripting.ScriptUtils;
-import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.runtime.AccessControlContextFactory;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ListAdapter;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptUtils;
+import org.openjdk.nashorn.internal.codegen.CompilerConstants.Call;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.runtime.AccessControlContextFactory;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ListAdapter;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
 /**
  * This is the main dynamic linker for Nashorn. It is used for linking all {@link ScriptObject} and its subclasses (this
@@ -362,4 +362,3 @@ private static MethodHandle findOwnMH(final String name, final Class rtype, f
         return MH.findStatic(MethodHandles.lookup(), NashornLinker.class, name, MH.type(rtype, types));
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index 16778813a..f5d68644d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -37,11 +37,11 @@
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.dynalink.linker.support.TypeUtilities;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Symbol;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Symbol;
 
 /**
  * Internal linker for String, Boolean, and Number objects, only ever used by Nashorn engine and not exposed to other
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
index 01a565726..974b60ad6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Modifier;
@@ -38,8 +38,8 @@
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.dynalink.linker.support.Guards;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
 
 /**
  * Internal linker for {@link StaticClass} objects, only ever used by Nashorn engine and not exposed to other engines.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index 5a321d0d1..831403d0d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -36,16 +36,16 @@
 import jdk.dynalink.linker.GuardedInvocation;
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.support.Guards;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.FindProperty;
-import jdk.nashorn.internal.runtime.GlobalConstants;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.FindProperty;
+import org.openjdk.nashorn.internal.runtime.GlobalConstants;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * Implements lookup of methods to link for dynamic operations on JavaScript primitive values (booleans, strings, and
- * numbers). This class is only public so it can be accessed by classes in the {@code jdk.nashorn.internal.objects}
+ * numbers). This class is only public so it can be accessed by classes in the {@code org.openjdk.nashorn.internal.objects}
  * package.
  */
 public final class PrimitiveLookup {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
index a168fe1b7..b75c7d657 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package org.openjdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static org.openjdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
@@ -36,9 +36,9 @@
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
 
 /**
  * Check java reflection permission for java reflective and java.lang.invoke access from scripts
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/DebugLogger.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/DebugLogger.java
index 99936c555..d8a6c8324 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/DebugLogger.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.logging;
+package org.openjdk.nashorn.internal.runtime.logging;
 
 import java.io.PrintWriter;
 import java.security.AccessControlContext;
@@ -38,12 +38,12 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import java.util.logging.LoggingPermission;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.events.RuntimeEvent;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.events.RuntimeEvent;
 
 /**
  * Wrapper class for Logging system. This is how you are supposed to register a logger and use it
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/Loggable.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/Loggable.java
index 329500357..964e258fc 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/Loggable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.logging;
+package org.openjdk.nashorn.internal.runtime.logging;
 
-import jdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Context;
 
 /**
  * Interface implemented by classes that are loggable.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/Logger.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/Logger.java
index a407fec33..93f731876 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/logging/Logger.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.logging;
+package org.openjdk.nashorn.internal.runtime.logging;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/KeyValueOption.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/KeyValueOption.java
index aee6caf0b..84f13c3f1 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/KeyValueOption.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.options;
+package org.openjdk.nashorn.internal.runtime.options;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/LoggingOption.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/LoggingOption.java
index e1d9cede6..f3a7c8f72 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/LoggingOption.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.options;
+package org.openjdk.nashorn.internal.runtime.options;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/Option.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/Option.java
index feaff1f18..bf947bc48 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/Option.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.options;
+package org.openjdk.nashorn.internal.runtime.options;
 
 /**
  * This is an option class that at its most primitive level just wraps a
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/OptionTemplate.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/OptionTemplate.java
index 21ccb2d1c..e246acef3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/OptionTemplate.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.options;
+package org.openjdk.nashorn.internal.runtime.options;
 
 import java.util.Locale;
 import java.util.TimeZone;
-import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
+import org.openjdk.nashorn.internal.runtime.QuotedStringTokenizer;
 
 /**
  * This describes the valid input for an option, as read from the resource
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/Options.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/Options.java
index 32f7fde60..1abad2cd5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/options/Options.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.options;
+package org.openjdk.nashorn.internal.runtime.options;
 
 import java.io.PrintWriter;
 import java.security.AccessControlContext;
@@ -49,7 +49,7 @@
 import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
+import org.openjdk.nashorn.internal.runtime.QuotedStringTokenizer;
 
 /**
  * Manages global runtime options.
@@ -595,7 +595,7 @@ private static void initProps(final KeyValueOption kv) {
     /**
      * Resource name for properties file
      */
-    private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Options";
+    private static final String MESSAGES_RESOURCE = "org.openjdk.nashorn.internal.runtime.resources.Options";
 
     /**
      * Resource bundle for properties file
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/JdkRegExp.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/JdkRegExp.java
index e88471633..239ef0169 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/JdkRegExp.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 import static java.util.regex.Pattern.MULTILINE;
@@ -32,7 +32,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import jdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.ParserException;
 
 /**
  * Default regular expression implementation based on java.util.regex package.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/JoniRegExp.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/JoniRegExp.java
index ccddc876f..f8ea2108f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/JoniRegExp.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.regexp.joni.Matcher;
-import jdk.nashorn.internal.runtime.regexp.joni.Option;
-import jdk.nashorn.internal.runtime.regexp.joni.Regex;
-import jdk.nashorn.internal.runtime.regexp.joni.Region;
-import jdk.nashorn.internal.runtime.regexp.joni.Syntax;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.JOniException;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Matcher;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Option;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Regex;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Region;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Syntax;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.JOniException;
 
 /**
  * Regular expression implementation based on the Joni engine from the JRuby project.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExp.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExp.java
index ac57c9fbb..b738e6a27 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExp.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 import java.util.regex.MatchResult;
-import jdk.nashorn.internal.runtime.BitVector;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.BitVector;
+import org.openjdk.nashorn.internal.runtime.ECMAErrors;
+import org.openjdk.nashorn.internal.runtime.ParserException;
 
 /**
  * This is the base class for representing a parsed regular expression.
@@ -155,7 +155,7 @@ public BitVector getGroupsInNegativeLookahead() {
      *
      * @param key the message key
      * @param str string argument
-     * @throws jdk.nashorn.internal.runtime.ParserException unconditionally
+     * @throws org.openjdk.nashorn.internal.runtime.ParserException unconditionally
      */
     protected static void throwParserException(final String key, final String str) throws ParserException {
         throw new ParserException(ECMAErrors.getMessage("parser.error.regex." + key, str));
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpFactory.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpFactory.java
index 2d37a7614..4fbe43190 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpFactory.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
-import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.runtime.ParserException;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Factory class for regular expressions. This class creates instances of {@link JdkRegExp}.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
index 2697cdf75..0e99ce507 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 import java.util.regex.MatchResult;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpResult.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpResult.java
index cd81be3cc..c44ed369c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpResult.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 /**
  * Match tuple to keep track of ongoing regexp match.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpScanner.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpScanner.java
index 6f122a3b4..18ef63351 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/RegExpScanner.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp;
+package org.openjdk.nashorn.internal.runtime.regexp;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -31,9 +31,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.PatternSyntaxException;
-import jdk.nashorn.internal.parser.Lexer;
-import jdk.nashorn.internal.parser.Scanner;
-import jdk.nashorn.internal.runtime.BitVector;
+import org.openjdk.nashorn.internal.parser.Lexer;
+import org.openjdk.nashorn.internal.parser.Scanner;
+import org.openjdk.nashorn.internal.runtime.BitVector;
 
 /**
  * Scan a JavaScript regexp, converting to Java regex if necessary.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Analyser.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Analyser.java
index 6c003b301..3cf84f67c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Analyser.java
@@ -17,34 +17,34 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAll;
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnAt;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isMultiline;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode.newAltNode;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
+
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAll;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnAt;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isMultiline;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode.newAltNode;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
 import java.util.HashSet;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.ObjPtr;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.ObjPtr;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 
 final class Analyser extends Parser {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
index 5ecfec4f8..3c48c65a7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
@@ -17,9 +17,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
 
 final class ApplyCaseFold {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
similarity index 87%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
index ce25af626..067b30731 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
@@ -17,10 +17,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
 
 @SuppressWarnings("javadoc")
 public final class ApplyCaseFoldArg {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
index b343d7752..2bb1bda37 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
@@ -17,27 +17,27 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isDynamic;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isMultiline;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
+
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isDynamic;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isMultiline;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
 
 final class ArrayCompiler extends Compiler {
     private int[] code;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/BitSet.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/BitSet.java
index db6df1189..6d50c8e3b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/BitSet.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public final class BitSet {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
index 91cf71980..8b155a922 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 final class BitStatus {
     public static final int BIT_STATUS_BITS_NUM = 4 * 8;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
index f5fce08bc..3bd19bdeb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
@@ -17,21 +17,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
-import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isNewLine;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindNotEmpty;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotBol;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotEol;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isPosixRegion;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
+
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isNewLine;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isFindNotEmpty;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isNotBol;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isNotEol;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isPosixRegion;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
 
 class ByteCodeMachine extends StackMachine {
     private int bestLen;          // return value
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
index fc61ee80c..e913a0ac2 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
@@ -17,13 +17,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.Arguments;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.Arguments;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
 
 class ByteCodePrinter {
     final int[] code;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
index 3436e122c..938b380d8 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
@@ -17,10 +17,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 
 @SuppressWarnings("javadoc")
 public final class CodeRangeBuffer implements Cloneable {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Compiler.java
similarity index 83%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Compiler.java
index 73752caa0..c1d662119 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Compiler.java
@@ -17,20 +17,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
-
-import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
+
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
 
 abstract class Compiler implements ErrorMessages {
     protected final Analyser analyser;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Config.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Config.java
index f9a8c6028..3d1fec622 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Config.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 import java.io.PrintStream;
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
index b6b46deda..6251173a4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
@@ -17,11 +17,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 import java.util.Arrays;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
 
 @SuppressWarnings("javadoc")
 public final class EncodingHelper {
@@ -297,4 +297,3 @@ public static boolean isCodeCType(final int code, final int ctype) {
         }
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Lexer.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Lexer.java
index 27c010e84..d5792f35e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Lexer.java
@@ -17,18 +17,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isSingleline;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.MetaChar;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
+
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isSingleline;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.MetaChar;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 
 class Lexer extends ScannerSupport {
     protected final ScanEnvironment env;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Matcher.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Matcher.java
index b1a733d99..1db109ec6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Matcher.java
@@ -18,11 +18,11 @@
  * SOFTWARE.
  */
 
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
 
 @SuppressWarnings("javadoc")
 public abstract class Matcher extends IntHolder {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
index 70642d5e7..0a6a3dd5c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public abstract class MatcherFactory {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
index 83a9e2dc0..22ada4194 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 final class MinMaxLen {
     int min; /* min byte length */
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
index a5e569dc9..37a09a9b4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public final class NodeOptInfo {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
index 7c7f51405..a140fae18 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
@@ -17,9 +17,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
 
 final class OptAnchorInfo implements AnchorType {
     int leftAnchor;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
index ba1eb136f..6d9ecffa0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 // remove this one in future and pass mmd directly
 final class OptEnvironment {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
index cc2143dea..8606a4202 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 final class OptExactInfo {
     static final int OPT_EXACT_MAXLEN = 24;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
index a3c4c7c5e..d8b4e89b5 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 final class OptMapInfo {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Option.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Option.java
index ead990074..0861271ff 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Option.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public class Option {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Parser.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Parser.java
index 35fba7199..d609cb647 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Parser.java
@@ -17,31 +17,31 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnOff;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isDontCaptureGroup;
-import static jdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.AnyCharNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode.CCStateArg;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
+
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnOff;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isDontCaptureGroup;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.AnyCharNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode.CCStateArg;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 
 class Parser extends Lexer {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Regex.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Regex.java
index 1612f44bc..9d96e7622 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Regex.java
@@ -17,12 +17,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.RegexState;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.RegexState;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 
 @SuppressWarnings("javadoc")
 public final class Regex implements RegexState {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Region.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Region.java
index 782211208..2134f86dd 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Region.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public final class Region {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
similarity index 90%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
index 2e118435d..4c137cabd 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
@@ -17,12 +17,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsClear;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsClear;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
 
 @SuppressWarnings("javadoc")
 public final class ScanEnvironment {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
index 6ae186c82..4c3a10ad8 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
@@ -17,10 +17,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
 
 abstract class ScannerSupport extends IntHolder implements ErrorMessages {
 
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
index 7fea303b5..1997c833a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public abstract class SearchAlgorithm {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
index 36a65d62f..90e1e611a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 final class StackEntry {
     int type;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
index 4cc33baf9..7c13d3624 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
@@ -17,11 +17,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 import java.lang.ref.WeakReference;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.StackType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.StackType;
 
 abstract class StackMachine extends Matcher implements StackType {
     protected static final int INVALID_INDEX = -1;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Syntax.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Syntax.java
index 97f57e9ad..55ab2bf4b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Syntax.java
@@ -17,10 +17,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.constants.MetaChar.INEFFECTIVE_META_CHAR;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.SyntaxProperties;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.constants.MetaChar.INEFFECTIVE_META_CHAR;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.SyntaxProperties;
 
 @SuppressWarnings("javadoc")
 public final class Syntax implements SyntaxProperties {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Token.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Token.java
index 095bb07e7..68af1381d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Token.java
@@ -17,9 +17,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
-import jdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
 
 final class Token {
     TokenType type;
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
index 2529684d2..c4f9c7c4f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 /**
  * @author Ola Bini
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Warnings.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Warnings.java
index 09708bcd4..a68ef20cf 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/Warnings.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni;
+package org.openjdk.nashorn.internal.runtime.regexp.joni;
 
 @SuppressWarnings("javadoc")
 public interface Warnings {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
index ab2e51899..fc6128288 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
@@ -17,9 +17,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
-import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
 
 @SuppressWarnings("javadoc")
 public final class AnchorNode extends Node implements AnchorType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
index 900932e37..4947eb61c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
 @SuppressWarnings("javadoc")
 public final class AnyCharNode extends Node {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
index 573c1ec79..f150ad8ac 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
@@ -17,9 +17,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
-import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
 
 @SuppressWarnings("javadoc")
 public final class BackRefNode extends StateNode {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
index 123e5c360..3555f4e7e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
@@ -17,22 +17,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
-
-import jdk.nashorn.internal.runtime.regexp.joni.BitSet;
-import jdk.nashorn.internal.runtime.regexp.joni.CodeRangeBuffer;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
-import jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper;
-import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
-import jdk.nashorn.internal.runtime.regexp.joni.Syntax;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
-import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import org.openjdk.nashorn.internal.runtime.regexp.joni.BitSet;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.CodeRangeBuffer;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Config;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.EncodingHelper;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Syntax;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 
 @SuppressWarnings("javadoc")
 public final class CClassNode extends Node {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
similarity index 93%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
index d3c258b6b..5bf56f2f4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
@@ -17,12 +17,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
 import java.util.Set;
-import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
-import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
 
 @SuppressWarnings("javadoc")
 public final class ConsAltNode extends Node {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
index 947372112..145fe4f21 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
@@ -17,10 +17,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
-import jdk.nashorn.internal.runtime.regexp.joni.Option;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Option;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
 
 @SuppressWarnings("javadoc")
 public final class EncloseNode extends StateNode implements EncloseType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
index d7205165f..555933c9a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
@@ -17,12 +17,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
 import java.util.Set;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
-import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Config;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
 
 @SuppressWarnings("javadoc")
 public abstract class Node implements NodeType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
index 6a28f78ac..1cbc9bdf6 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
@@ -17,18 +17,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.A;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.AQ;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.ASIS;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.DEL;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.PQ_Q;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.P_QQ;
-import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.QQ;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
-import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.A;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.AQ;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.ASIS;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.DEL;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.PQ_Q;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.P_QQ;
+import static org.openjdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.ReduceType.QQ;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Config;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
 
 @SuppressWarnings("javadoc")
 public final class QuantifierNode extends StateNode {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
index 2d75ebc8f..345498f2f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
@@ -17,9 +17,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
-import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeStatus;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.NodeStatus;
 
 @SuppressWarnings("javadoc")
 public abstract class StateNode extends Node implements NodeStatus {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
index e0156f562..c310964a7 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
@@ -17,10 +17,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.ast;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.ast;
 
-import jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.StringType;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.EncodingHelper;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.constants.StringType;
 
 @SuppressWarnings("javadoc")
 public final class StringNode extends Node implements StringType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
index 38da6ae65..6263dcadd 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface AnchorType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
index ba96564d8..879a2c9aa 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface Arguments {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
index ba4bf7565..6a17cb3db 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface AsmConstants {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
index bd98a6b1c..e1aa7869d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public enum CCSTATE {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
index f45f94a58..88972a42e 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public enum CCVALTYPE {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
index f82e8af96..da93fcefa 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface EncloseType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
index 82c7682cb..bdfaf4ae4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface MetaChar {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
index b5e0ea4c8..fce92d2c3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface NodeStatus {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
index fc3670b9a..f6da902cb 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface NodeType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
index bb31740d8..cc597b334 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface OPCode {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
index 870a5ebca..767177859 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface OPSize {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
index 5f1a3cd41..637208d53 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 // we dont need this ATM
 @SuppressWarnings("javadoc")
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
index 67bd0e1aa..944a175d4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface StackPopLevel {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
similarity index 97%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
index 539804f99..d25a75e58 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface StackType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
index 33347a169..b310f2856 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface StringType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
similarity index 99%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
index 8f8b06474..c51913b3a 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface SyntaxProperties {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
index 5708a397f..ae2cfcabf 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface TargetInfo {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
index 72b94f696..bdd2da95b 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public enum TokenType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
index 9b6650def..14a6c4c23 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.constants;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.constants;
 
 @SuppressWarnings("javadoc")
 public interface Traverse {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
index d248efe13..ff5df1156 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.encoding;
 
 @SuppressWarnings("javadoc")
 public interface CharacterType {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
index 06fc7fb01..dc0bc1fa4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.encoding;
 
 @SuppressWarnings("javadoc")
 public class IntHolder {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
index 18bfa0d9c..eead9a657 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.encoding;
 
 @SuppressWarnings("javadoc")
 public final class ObjPtr {
@@ -32,4 +32,3 @@ public ObjPtr(final T p) {
     public T p;
 
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
index da986489c..f5839fa5f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.exception;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.exception;
 
 @SuppressWarnings("javadoc")
 public interface ErrorMessages {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
index 22642dd0c..599b724ff 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.exception;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.exception;
 
 @SuppressWarnings("javadoc")
 public class InternalException extends JOniException{
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
index a3892c74d..af58dfde3 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.exception;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.exception;
 
 @SuppressWarnings("javadoc")
 public class JOniException extends RuntimeException{
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
index 4698ab76b..8d2b39316 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.exception;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.exception;
 
 @SuppressWarnings("javadoc")
 public class SyntaxException extends JOniException{
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
index 75b590ec9..807082e69 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
@@ -17,7 +17,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package jdk.nashorn.internal.runtime.regexp.joni.exception;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.exception;
 
 @SuppressWarnings("javadoc")
 public class ValueException extends SyntaxException {
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Functions.properties
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Functions.properties
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Messages.properties
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Messages.properties
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Options.properties
similarity index 98%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Options.properties
index 31f761b83..757c2a78c 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/Options.properties
@@ -223,14 +223,6 @@ nashorn.option.log = {                                                       \
     type=Log                                                                 \
 }
 
-nashorn.option.no.deprecation.warning = {                      \
-    name="--no-deprecation-warning",                           \
-    type=Boolean,                                 \
-    default=false,                                \
-    desc="Do not show nashorn deprecation warning."  \
-}
-
-
 nashorn.option.lazy.compilation = {                                                                      \
     name="--lazy-compilation",                                                                           \
     is_undocumented=true,                                                                                \
@@ -435,4 +427,3 @@ nashorn.option.version = {                \
     short_name="-v",                      \
     desc="Print version info of Nashorn." \
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/base.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/base.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/bootstrap.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/bootstrap.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/controls.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/controls.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/fxml.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/fxml.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/graphics.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/graphics.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/media.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/media.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/swing.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/swing.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/web.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/fx/web.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/mozilla_compat.js
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/mozilla_compat.js
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/parser.js
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/parser.js
index bd511f0e0..9bc5ac620 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/parser.js
@@ -49,7 +49,7 @@ function parse(/*code, [name], [location]*/) {
             code = arguments[0];
     }
 
-    var jsonStr = Packages.jdk.nashorn.api.scripting.ScriptUtils.parse(code, name, location);
+    var jsonStr = Packages.org.openjdk.nashorn.api.scripting.ScriptUtils.parse(code, name, location);
     return JSON.parse(jsonStr,
         function (prop, value) {
             if (typeof(value) == 'string' && prop == "value") {
@@ -62,4 +62,3 @@ function parse(/*code, [name], [location]*/) {
             }
         });
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/version.properties.template
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/runtime/resources/version.properties.template
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JD.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JD.java
index 11d6cacc4..4e61fcce4 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JD.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JD.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.scripts;
+package org.openjdk.nashorn.internal.scripts;
 
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Empty object class for dual primitive-object fields.
@@ -63,8 +63,8 @@ public JD(final ScriptObject proto) {
 
     /**
      * Constructor that takes a pre-initialized spill pool. Used by
-     * {@link jdk.nashorn.internal.codegen.SpillObjectCreator} and
-     * {@link jdk.nashorn.internal.parser.JSONParser} for initializing object literals
+     * {@link org.openjdk.nashorn.internal.codegen.SpillObjectCreator} and
+     * {@link org.openjdk.nashorn.internal.parser.JSONParser} for initializing object literals
      *
      * @param map            property map
      * @param primitiveSpill primitive spill pool
@@ -85,4 +85,3 @@ public static ScriptObject allocate(final PropertyMap map) {
         return new JD(map);
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JO.java
similarity index 89%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JO.java
index 1f9aa7ca1..8ed5b2843 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JO.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.scripts;
+package org.openjdk.nashorn.internal.scripts;
 
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 
 /**
  * Empty object class for object-only fields.
@@ -63,8 +63,8 @@ public JO(final ScriptObject proto) {
 
     /**
      * Constructor that takes a pre-initialized spill pool. Used by
-     * {@link jdk.nashorn.internal.codegen.SpillObjectCreator} and
-     * {@link jdk.nashorn.internal.parser.JSONParser} for initializing object literals
+     * {@link org.openjdk.nashorn.internal.codegen.SpillObjectCreator} and
+     * {@link org.openjdk.nashorn.internal.parser.JSONParser} for initializing object literals
      *
      * @param map            property map
      * @param primitiveSpill primitive spill pool
@@ -85,4 +85,3 @@ public static ScriptObject allocate(final PropertyMap map) {
         return new JO(map);
     }
 }
-
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JS.java
similarity index 96%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JS.java
index 8711d648b..c2df5031d 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/JS.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.scripts;
+package org.openjdk.nashorn.internal.scripts;
 
 /**
  * Root of script classes.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/ModuleGraphManipulator.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/ModuleGraphManipulator.java
index 72e0be1d2..b667f5b15 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/scripts/ModuleGraphManipulator.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.scripts;
+package org.openjdk.nashorn.internal.scripts;
 
-import jdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.JSObject;
 
 /**
  * Nashorn's StructureLoader and ScriptLoader instances load
  * this class in the respective dynamic modules created. This
  * class is never loaded by Nashorn's own class loader. The
  * .class bytes of this class are loaded as resource by the
- * {@link jdk.nashorn.internal.runtime.NashornLoader} class. This class
+ * {@link org.openjdk.nashorn.internal.runtime.NashornLoader} class. This class
  * exists in this package because nashorn structures and scripts
  * modules use this package name for the only exported package
  * from those modules.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/PartialParser.java
similarity index 95%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/PartialParser.java
index db87140c2..cc985bae0 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/PartialParser.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/PartialParser.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.tools;
+package org.openjdk.nashorn.tools;
 
-import jdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.Context;
 
 /**
  * Partial parsing support for code completion of expressions.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/Shell.java
similarity index 94%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/Shell.java
index e141eb7d2..dde732f24 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/Shell.java
@@ -23,30 +23,30 @@
  * questions.
  */
 
-package jdk.nashorn.tools;
-
-import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.Compiler.CompilationPhases;
-import jdk.nashorn.internal.ir.Expression;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
-import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.objects.NativeSymbol;
-import jdk.nashorn.internal.parser.Parser;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.ScriptEnvironment;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.ScriptingFunctions;
-import jdk.nashorn.internal.runtime.Symbol;
-import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
-import jdk.nashorn.internal.runtime.options.Options;
+package org.openjdk.nashorn.tools;
+
+import org.openjdk.nashorn.api.scripting.NashornException;
+import org.openjdk.nashorn.internal.codegen.Compiler;
+import org.openjdk.nashorn.internal.codegen.Compiler.CompilationPhases;
+import org.openjdk.nashorn.internal.ir.Expression;
+import org.openjdk.nashorn.internal.ir.FunctionNode;
+import org.openjdk.nashorn.internal.ir.debug.ASTWriter;
+import org.openjdk.nashorn.internal.ir.debug.PrintVisitor;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.NativeSymbol;
+import org.openjdk.nashorn.internal.parser.Parser;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.Property;
+import org.openjdk.nashorn.internal.runtime.ScriptEnvironment;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.ScriptingFunctions;
+import org.openjdk.nashorn.internal.runtime.Symbol;
+import org.openjdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -69,7 +69,7 @@
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 
 /**
  * Command line Shell for processing JavaScript files.
@@ -79,7 +79,7 @@ public class Shell implements PartialParser {
     /**
      * Resource name for properties file
      */
-    private static final String MESSAGE_RESOURCE = "jdk.nashorn.tools.resources.Shell";
+    private static final String MESSAGE_RESOURCE = "org.openjdk.nashorn.tools.resources.Shell";
     /**
      * Shell message bundle.
      */
@@ -170,9 +170,6 @@ protected final int run(final InputStream in, final OutputStream out, final Outp
 
         final Global global = context.createGlobal();
         final ScriptEnvironment env = context.getEnv();
-        if (!env._no_deprecation_warning) {
-            System.err.println("Warning: The jjs tool is planned to be removed from a future JDK release");
-        }
         final List files = env.getFiles();
         if (files.isEmpty()) {
             return readEvalPrint(context, global);
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/ShellFunctions.java
similarity index 91%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/ShellFunctions.java
index 2bf0964ab..7fdd3b839 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/ShellFunctions.java
+++ b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/ShellFunctions.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package jdk.nashorn.tools;
+package org.openjdk.nashorn.tools;
 
-import static jdk.nashorn.internal.lookup.Lookup.MH;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static org.openjdk.nashorn.internal.lookup.Lookup.MH;
+import static org.openjdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptingFunctions;
-import jdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptingFunctions;
+import org.openjdk.nashorn.internal.objects.Global;
 
 /**
  * Global functions supported only in shell interactive mode.
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties b/src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/resources/Shell.properties
similarity index 100%
rename from src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties
rename to src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/tools/resources/Shell.properties
diff --git a/src/jdk.scripting.nashorn/share/legal/double-conversion.md b/src/org.openjdk.nashorn/share/legal/double-conversion.md
similarity index 100%
rename from src/jdk.scripting.nashorn/share/legal/double-conversion.md
rename to src/org.openjdk.nashorn/share/legal/double-conversion.md
diff --git a/src/jdk.scripting.nashorn/share/legal/joni.md b/src/org.openjdk.nashorn/share/legal/joni.md
similarity index 100%
rename from src/jdk.scripting.nashorn/share/legal/joni.md
rename to src/org.openjdk.nashorn/share/legal/joni.md
diff --git a/src/sample/nashorn/BufferArray.java b/src/sample/nashorn/BufferArray.java
index b26b5c08e..83c1ba98d 100644
--- a/src/sample/nashorn/BufferArray.java
+++ b/src/sample/nashorn/BufferArray.java
@@ -30,11 +30,11 @@
  */
 
 import java.nio.DoubleBuffer;
-import jdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
 
 /**
  * Simple class demonstrating pluggable script object
- * implementation. By implementing jdk.nashorn.api.scripting.JSObject
+ * implementation. By implementing org.openjdk.nashorn.api.scripting.JSObject
  * (or extending AbstractJSObject which implements it), you
  * can supply a friendly script object. Nashorn will call
  * 'magic' methods on such a class on 'obj.foo, obj.foo = 33,
diff --git a/src/sample/nashorn/EvalWithArbitraryThis.java b/src/sample/nashorn/EvalWithArbitraryThis.java
index 4b9c0c76b..83ef976d7 100644
--- a/src/sample/nashorn/EvalWithArbitraryThis.java
+++ b/src/sample/nashorn/EvalWithArbitraryThis.java
@@ -30,7 +30,7 @@
  */
 
 import javax.script.*;
-import jdk.nashorn.api.scripting.*;
+import org.openjdk.nashorn.api.scripting.*;
 
 // Simple nashorn demo that evals a script with arbitrary script
 // object bound as "this" for the evaluated script.
diff --git a/src/sample/nashorn/breakcontinue_in_tryfinally.js b/src/sample/nashorn/breakcontinue_in_tryfinally.js
index 06c0bce38..3fafd1a5b 100644
--- a/src/sample/nashorn/breakcontinue_in_tryfinally.js
+++ b/src/sample/nashorn/breakcontinue_in_tryfinally.js
@@ -45,8 +45,8 @@ if (!file.exists()) {
 }
 
 var Files = Java.type("java.nio.file.Files");
-var Parser = Java.type("jdk.nashorn.api.tree.Parser");
-var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES5_1");
+var Parser = Java.type("org.openjdk.nashorn.api.tree.Parser");
+var SimpleTreeVisitor = Java.type("org.openjdk.nashorn.api.tree.SimpleTreeVisitorES5_1");
 
 var parser = Parser.create("-scripting", "--const-as-var");
 
diff --git a/src/sample/nashorn/engine/foreignobject.js b/src/sample/nashorn/engine/foreignobject.js
index 930c3e853..b0d447bf8 100644
--- a/src/sample/nashorn/engine/foreignobject.js
+++ b/src/sample/nashorn/engine/foreignobject.js
@@ -51,7 +51,7 @@ engine.eval(< 28 and it is 1
 arr2 = [0]
diff --git a/test/nashorn/script/basic/JDK-8043930.js b/test/nashorn/script/basic/JDK-8043930.js
index a7c93f428..656abdb9e 100644
--- a/test/nashorn/script/basic/JDK-8043930.js
+++ b/test/nashorn/script/basic/JDK-8043930.js
@@ -28,7 +28,7 @@
  * @run
  */
 
-var NonPublicClass = Java.type("jdk.nashorn.test.models.NonPublicClass");
+var NonPublicClass = Java.type("org.openjdk.nashorn.test.models.NonPublicClass");
 try {
     var obj = new NonPublicClass();
     fail("Expected TypeError to be thrown!");
diff --git a/test/nashorn/script/basic/JDK-8043930.js.EXPECTED b/test/nashorn/script/basic/JDK-8043930.js.EXPECTED
index ee5cf9dc8..b57e472aa 100644
--- a/test/nashorn/script/basic/JDK-8043930.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8043930.js.EXPECTED
@@ -1 +1 @@
-TypeError: new cannot be used with non-public java type jdk.nashorn.test.models.NonPublicClass.
+TypeError: new cannot be used with non-public java type org.openjdk.nashorn.test.models.NonPublicClass.
diff --git a/test/nashorn/script/basic/JDK-8044534.js b/test/nashorn/script/basic/JDK-8044534.js
index e274328a8..b13028cb8 100644
--- a/test/nashorn/script/basic/JDK-8044534.js
+++ b/test/nashorn/script/basic/JDK-8044534.js
@@ -28,7 +28,7 @@
  * @run
  */
 
-var inspect = Java.type("jdk.nashorn.test.tools.StaticTypeInspector").inspect;
+var inspect = Java.type("org.openjdk.nashorn.test.tools.StaticTypeInspector").inspect;
 
 print(inspect(+true,  "+true "));
 print(inspect(+false, "+false"));
diff --git a/test/nashorn/script/basic/JDK-8049086.js b/test/nashorn/script/basic/JDK-8049086.js
index 7dd7ac481..9c6f04161 100644
--- a/test/nashorn/script/basic/JDK-8049086.js
+++ b/test/nashorn/script/basic/JDK-8049086.js
@@ -65,7 +65,7 @@ print("eval is java function? " + Java.isJavaFunction(eval));
 print("println is java function? " + Java.isJavaFunction(println));
 print("getProperty is java function? " + Java.isJavaFunction(getProperty));
 
-var JSObject = Java.type("jdk.nashorn.api.scripting.JSObject");
+var JSObject = Java.type("org.openjdk.nashorn.api.scripting.JSObject");
 print("callable JSObject is function? " +
     Java.isJavaFunction(new JSObject() {
         isFunction: function() true,
diff --git a/test/nashorn/script/basic/JDK-8056978.js b/test/nashorn/script/basic/JDK-8056978.js
index 1b3577d4c..3fa9a3b1c 100644
--- a/test/nashorn/script/basic/JDK-8056978.js
+++ b/test/nashorn/script/basic/JDK-8056978.js
@@ -22,7 +22,7 @@
  */
 
 /**
- * JDK-8056978: ClassCastException: cannot cast jdk.nashorn.internal.scripts.JO*
+ * JDK-8056978: ClassCastException: cannot cast org.openjdk.nashorn.internal.scripts.JO*
  *
  * @test
  * @run
diff --git a/test/nashorn/script/basic/JDK-8059443.js b/test/nashorn/script/basic/JDK-8059443.js
index acd0482b3..0586b54fa 100644
--- a/test/nashorn/script/basic/JDK-8059443.js
+++ b/test/nashorn/script/basic/JDK-8059443.js
@@ -31,7 +31,7 @@
  * @run
  */
 
-var NullProvider = Java.type("jdk.nashorn.test.models.NullProvider");
+var NullProvider = Java.type("org.openjdk.nashorn.test.models.NullProvider");
 
 try {
     if (!NullProvider.getBoolean()) { print("yay"); }
diff --git a/test/nashorn/script/basic/JDK-8062799.js b/test/nashorn/script/basic/JDK-8062799.js
index 99603327a..362037e18 100644
--- a/test/nashorn/script/basic/JDK-8062799.js
+++ b/test/nashorn/script/basic/JDK-8062799.js
@@ -29,7 +29,7 @@
  */
 
 (function() {
-    var inspect = Java.type("jdk.nashorn.test.tools.StaticTypeInspector").inspect;
+    var inspect = Java.type("org.openjdk.nashorn.test.tools.StaticTypeInspector").inspect;
     
     var b = true;
     var i = 1;
diff --git a/test/nashorn/script/basic/JDK-8068573.js b/test/nashorn/script/basic/JDK-8068573.js
index ad416b1a8..0fbf541ab 100644
--- a/test/nashorn/script/basic/JDK-8068573.js
+++ b/test/nashorn/script/basic/JDK-8068573.js
@@ -29,14 +29,14 @@
  */
 
 // Invoke a setter using []. It's important that the setter returns void.
-var pb = new (Java.type("jdk.nashorn.test.models.PropertyBind"))
+var pb = new (Java.type("org.openjdk.nashorn.test.models.PropertyBind"))
 var n = "writeOnly";
 pb[n] = 2;
 Assert.assertEquals(pb.peekWriteOnly(), 2);
 
 // Invoke an overloaded setter using []. It's important that one of the 
 // overloads returns void.
-var os = new (Java.type("jdk.nashorn.test.models.OverloadedSetter"))
+var os = new (Java.type("org.openjdk.nashorn.test.models.OverloadedSetter"))
 var n2 = "color";
 os[n2] = 3; // exercise int overload
 Assert.assertEquals(os.peekColor(), "3");
diff --git a/test/nashorn/script/basic/JDK-8068580.js b/test/nashorn/script/basic/JDK-8068580.js
index 0394dea45..3c021f14b 100644
--- a/test/nashorn/script/basic/JDK-8068580.js
+++ b/test/nashorn/script/basic/JDK-8068580.js
@@ -28,12 +28,12 @@
  * @run
  */
 
-var BigAbstract = Java.type("jdk.nashorn.test.models.BigAbstract")
+var BigAbstract = Java.type("org.openjdk.nashorn.test.models.BigAbstract")
 try {
     new BigAbstract({});
 } catch (e) {
     Assert.assertTrue(e instanceof TypeError);
-    Assert.assertEquals(e.message, "Can not extend/implement [class jdk.nashorn.test.models.BigAbstract] because of java.lang.RuntimeException: Method code too large!");
+    Assert.assertEquals(e.message, "Can not extend/implement [class org.openjdk.nashorn.test.models.BigAbstract] because of java.lang.RuntimeException: Method code too large!");
 }
 try {
     BigAbstract.accept(function() { });
diff --git a/test/nashorn/script/basic/JDK-8068903.js b/test/nashorn/script/basic/JDK-8068903.js
index 8209bbbea..aa921b262 100644
--- a/test/nashorn/script/basic/JDK-8068903.js
+++ b/test/nashorn/script/basic/JDK-8068903.js
@@ -28,7 +28,7 @@
  * @run
  */
 
-var vc = new (Java.type("jdk.nashorn.test.models.VarArgConsumer"))(
+var vc = new (Java.type("org.openjdk.nashorn.test.models.VarArgConsumer"))(
     function(x) {
         Assert.assertTrue(x.length == 3);
         Assert.assertTrue(x[0] == 1);
diff --git a/test/nashorn/script/basic/JDK-8072426.js b/test/nashorn/script/basic/JDK-8072426.js
index 03846a1ab..de607faed 100644
--- a/test/nashorn/script/basic/JDK-8072426.js
+++ b/test/nashorn/script/basic/JDK-8072426.js
@@ -30,7 +30,7 @@
 
 Assert.assertTrue(java.math.RoundingMode.UP == "UP");
 
-var JSObject = Java.type("jdk.nashorn.api.scripting.JSObject");
+var JSObject = Java.type("org.openjdk.nashorn.api.scripting.JSObject");
 
 // Adds an "isFunction" member to the JSObject that returns the specified value
 function addIsFunction(isFunction, obj) {
diff --git a/test/nashorn/script/basic/JDK-8072596.js b/test/nashorn/script/basic/JDK-8072596.js
index 878824d7a..4606eca27 100644
--- a/test/nashorn/script/basic/JDK-8072596.js
+++ b/test/nashorn/script/basic/JDK-8072596.js
@@ -34,7 +34,7 @@ Assert.assertEquals(arr.length, 2);
 Assert.assertEquals(arr[0], "hello");
 Assert.assertEquals(arr[1], "world");
 
-var Jdk8072596TestSubject = Java.type("jdk.nashorn.test.models.Jdk8072596TestSubject");
+var Jdk8072596TestSubject = Java.type("org.openjdk.nashorn.test.models.Jdk8072596TestSubject");
 var testSubject = new Jdk8072596TestSubject({bar: 0});
 testSubject.test1(true, {foo: 1}, {bar: 2});
 testSubject.test2(true, {foo: 1}, {bar: 2}, {baz: 3}, {bing: 4});
diff --git a/test/nashorn/script/basic/JDK-8075207.js b/test/nashorn/script/basic/JDK-8075207.js
index 168345d9d..aa320235f 100644
--- a/test/nashorn/script/basic/JDK-8075207.js
+++ b/test/nashorn/script/basic/JDK-8075207.js
@@ -29,10 +29,10 @@
  * @run
  */
 
-var Parser = Java.type("jdk.nashorn.api.tree.Parser");
-var ExpressionStatementTree = Java.type("jdk.nashorn.api.tree.ExpressionStatementTree");
-var FunctionDeclarationTree = Java.type("jdk.nashorn.api.tree.FunctionDeclarationTree");
-var VariableTree = Java.type("jdk.nashorn.api.tree.VariableTree");
+var Parser = Java.type("org.openjdk.nashorn.api.tree.Parser");
+var ExpressionStatementTree = Java.type("org.openjdk.nashorn.api.tree.ExpressionStatementTree");
+var FunctionDeclarationTree = Java.type("org.openjdk.nashorn.api.tree.FunctionDeclarationTree");
+var VariableTree = Java.type("org.openjdk.nashorn.api.tree.VariableTree");
 
 var parser = Parser.create();
 
diff --git a/test/nashorn/script/basic/JDK-8075448.js b/test/nashorn/script/basic/JDK-8075448.js
index ec6cb6f11..e25d4055b 100644
--- a/test/nashorn/script/basic/JDK-8075448.js
+++ b/test/nashorn/script/basic/JDK-8075448.js
@@ -30,9 +30,9 @@
  * @run
  */
 
-var Parser = Java.type("jdk.nashorn.api.tree.Parser");
-var ForLoopTree = Java.type("jdk.nashorn.api.tree.ForLoopTree");
-var VariableTree = Java.type("jdk.nashorn.api.tree.VariableTree");
+var Parser = Java.type("org.openjdk.nashorn.api.tree.Parser");
+var ForLoopTree = Java.type("org.openjdk.nashorn.api.tree.ForLoopTree");
+var VariableTree = Java.type("org.openjdk.nashorn.api.tree.VariableTree");
 var parser = Parser.create();
 
 var code = <", source);
diff --git a/test/nashorn/script/trusted/JDK-8008305.js b/test/nashorn/script/trusted/JDK-8008305.js
index d75561b46..7bdd84562 100644
--- a/test/nashorn/script/trusted/JDK-8008305.js
+++ b/test/nashorn/script/trusted/JDK-8008305.js
@@ -27,7 +27,7 @@
  * @run
  */
 
-var URLReader = Java.type("jdk.nashorn.api.scripting.URLReader");
+var URLReader = Java.type("org.openjdk.nashorn.api.scripting.URLReader");
 var File = Java.type("java.io.File");
 var FileReader = Java.type("java.io.FileReader");
 var ScriptEngineManager = Java.type("javax.script.ScriptEngineManager");
diff --git a/test/nashorn/script/trusted/JDK-8021129.js b/test/nashorn/script/trusted/JDK-8021129.js
index 47ad5d427..b55c48d39 100644
--- a/test/nashorn/script/trusted/JDK-8021129.js
+++ b/test/nashorn/script/trusted/JDK-8021129.js
@@ -30,7 +30,7 @@
  * @run
  */
 
-var InternalRunnableSuperclass = Java.type("jdk.nashorn.test.models.InternalRunnableSuperclass");
+var InternalRunnableSuperclass = Java.type("org.openjdk.nashorn.test.models.InternalRunnableSuperclass");
 var r1 = InternalRunnableSuperclass.makeInternalRunnable();
 r1.run() // Can execute method from an implemented non-restricted interface
 print(r1.toString()) // Can execute public method from a superclass
diff --git a/test/nashorn/script/trusted/JDK-8021189.js b/test/nashorn/script/trusted/JDK-8021189.js
index c4c93cb9e..f7afd1a6b 100644
--- a/test/nashorn/script/trusted/JDK-8021189.js
+++ b/test/nashorn/script/trusted/JDK-8021189.js
@@ -27,7 +27,7 @@
  * @test
  * @run
  */
-var InternalRunnableSuperclass = Java.type("jdk.nashorn.test.models.InternalRunnableSuperclass");
+var InternalRunnableSuperclass = Java.type("org.openjdk.nashorn.test.models.InternalRunnableSuperclass");
 try {
     new (InternalRunnableSuperclass.getInternalRunnableType())();
 } catch(e) {
diff --git a/test/nashorn/script/trusted/JDK-8021189.js.EXPECTED b/test/nashorn/script/trusted/JDK-8021189.js.EXPECTED
index 846a562c8..8aa5d69ca 100644
--- a/test/nashorn/script/trusted/JDK-8021189.js.EXPECTED
+++ b/test/nashorn/script/trusted/JDK-8021189.js.EXPECTED
@@ -1 +1 @@
-java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessClassInPackage.jdk.nashorn.internal.test.models")
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessClassInPackage.org.openjdk.nashorn.internal.test.models")
diff --git a/test/nashorn/script/trusted/JDK-8025629.js b/test/nashorn/script/trusted/JDK-8025629.js
index f3f4cbad4..9ede38296 100644
--- a/test/nashorn/script/trusted/JDK-8025629.js
+++ b/test/nashorn/script/trusted/JDK-8025629.js
@@ -28,6 +28,6 @@
  * @run
  */
 
-load("classpath:jdk/nashorn/internal/runtime/test/resources/load_test.js")
+load("classpath:org/openjdk/nashorn/internal/runtime/test/resources/load_test.js")
 
 Assert.assertEquals(loadedFunc("hello"), "HELLO");
diff --git a/test/nashorn/script/trusted/JDK-8200215.js b/test/nashorn/script/trusted/JDK-8200215.js
index 82f66dea2..5e3f9885f 100644
--- a/test/nashorn/script/trusted/JDK-8200215.js
+++ b/test/nashorn/script/trusted/JDK-8200215.js
@@ -28,7 +28,7 @@
  * @run
  */
 
-var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
+var NashornScriptEngineFactory = Java.type("org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory");
 var factory = new NashornScriptEngineFactory();
 var engine = factory.getScriptEngine("-strict", "--language=es6");
 var bindings = engine.createBindings();
diff --git a/test/nashorn/script/trusted/NASHORN-638.js b/test/nashorn/script/trusted/NASHORN-638.js
index 0bd5d41f9..d761fd4cb 100644
--- a/test/nashorn/script/trusted/NASHORN-638.js
+++ b/test/nashorn/script/trusted/NASHORN-638.js
@@ -35,7 +35,7 @@
 
 function runScriptEngine(opts, code) {
     var imports = new JavaImporter(
-        Packages.jdk.nashorn.api.scripting,
+        Packages.org.openjdk.nashorn.api.scripting,
         java.io, java.lang, java.util);
 
     with(imports) {
diff --git a/test/nashorn/script/trusted/NASHORN-653.js b/test/nashorn/script/trusted/NASHORN-653.js
index b6d9a544c..3f486fc2a 100644
--- a/test/nashorn/script/trusted/NASHORN-653.js
+++ b/test/nashorn/script/trusted/NASHORN-653.js
@@ -73,7 +73,7 @@ function g() { \
 
 function runScriptEngine(opts, code) {
     var imports = new JavaImporter(
-        Packages.jdk.nashorn.api.scripting,
+        Packages.org.openjdk.nashorn.api.scripting,
         java.io, java.lang, java.util);
 
     with(imports) {
diff --git a/test/nashorn/script/trusted/classfilter.js b/test/nashorn/script/trusted/classfilter.js
index a50e4a2c1..34df84087 100644
--- a/test/nashorn/script/trusted/classfilter.js
+++ b/test/nashorn/script/trusted/classfilter.js
@@ -28,7 +28,7 @@
  * @run
  */
 
-var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
+var NashornScriptEngineFactory = Java.type("org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory");
 
 var fac = new NashornScriptEngineFactory();
 // allow only "java.*" classes to be accessed
diff --git a/test/nashorn/script/trusted/classfilter_extends.js b/test/nashorn/script/trusted/classfilter_extends.js
index e721b3a10..e90eb4515 100644
--- a/test/nashorn/script/trusted/classfilter_extends.js
+++ b/test/nashorn/script/trusted/classfilter_extends.js
@@ -27,7 +27,7 @@
  * @run
  */
 
-var factory = Java.type('jdk.nashorn.api.scripting.NashornScriptEngineFactory')
+var factory = Java.type('org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory')
 var engine  = new factory().getScriptEngine(function(str){
     return str.indexOf('java.lang.Class') != -1
             || str == 'java.lang.System'
diff --git a/test/nashorn/script/trusted/classfilter_extends.js.EXPECTED b/test/nashorn/script/trusted/classfilter_extends.js.EXPECTED
index 884e95abc..b122020d2 100644
--- a/test/nashorn/script/trusted/classfilter_extends.js.EXPECTED
+++ b/test/nashorn/script/trusted/classfilter_extends.js.EXPECTED
@@ -6,9 +6,9 @@ java.lang.ClassNotFoundException: java.lang.String
 [JavaClass java.util.ArrayList]
 [JavaClass java.lang.String]
 [JavaPackage java.lang.String]
-[JavaClass jdk.nashorn.javaadapters.java_util_ArrayList]
-[JavaClass jdk.nashorn.javaadapters.java_util_ArrayList]
-[JavaClass jdk.nashorn.javaadapters.java_io_File]
+[JavaClass org.openjdk.nashorn.javaadapters.java_util_ArrayList]
+[JavaClass org.openjdk.nashorn.javaadapters.java_util_ArrayList]
+[JavaClass org.openjdk.nashorn.javaadapters.java_io_File]
 TypeError: Java.extend needs Java types as its arguments. in  at line number 1
 java.lang.NullPointerException
 java.lang.ClassNotFoundException: java.lang.NullPointerException
diff --git a/test/nashorn/script/trusted/classfilter_mozilla_compat.js b/test/nashorn/script/trusted/classfilter_mozilla_compat.js
index cb05a3d7c..28fd55758 100644
--- a/test/nashorn/script/trusted/classfilter_mozilla_compat.js
+++ b/test/nashorn/script/trusted/classfilter_mozilla_compat.js
@@ -27,7 +27,7 @@
  * @run
  */
 
-var factory = Java.type('jdk.nashorn.api.scripting.NashornScriptEngineFactory')
+var factory = Java.type('org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory')
 var engine  = new factory().getScriptEngine(function(str){
     return str.indexOf('java.util') != -1;
 })
diff --git a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED
index 19db7152c..9c6e17208 100644
--- a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED
+++ b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED
@@ -1,7 +1,7 @@
-class jdk.nashorn.javaadapters.javax_script_ScriptContext
+class org.openjdk.nashorn.javaadapters.javax_script_ScriptContext
 TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41
-class jdk.nashorn.javaadapters.java_util_ArrayList
-class jdk.nashorn.javaadapters.java_util_ArrayList
+class org.openjdk.nashorn.javaadapters.java_util_ArrayList
+class org.openjdk.nashorn.javaadapters.java_util_ArrayList
 [JavaClass java.lang.Integer]
 TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16
 [JavaClass java.util.HashSet]
diff --git a/test/nashorn/script/trusted/event_queue.js b/test/nashorn/script/trusted/event_queue.js
index 158434161..16dbdf67a 100644
--- a/test/nashorn/script/trusted/event_queue.js
+++ b/test/nashorn/script/trusted/event_queue.js
@@ -36,15 +36,15 @@
 print(Debug);
 print();
 
-var Reflector     = Java.type("jdk.nashorn.test.models.Reflector");
+var Reflector     = Java.type("org.openjdk.nashorn.test.models.Reflector");
 var forName       = java.lang.Class["forName(String)"];
-var RuntimeEvent  = forName("jdk.nashorn.internal.runtime.events.RuntimeEvent").static;
+var RuntimeEvent  = forName("org.openjdk.nashorn.internal.runtime.events.RuntimeEvent").static;
 var getValue      = RuntimeEvent.class.getMethod("getValue");
 var getValueClass = RuntimeEvent.class.getMethod("getValueClass");
 
 print(RuntimeEvent);
 
-var RewriteException = forName("jdk.nashorn.internal.runtime.RewriteException").static;
+var RewriteException = forName("org.openjdk.nashorn.internal.runtime.RewriteException").static;
 var getReturnType    = RewriteException.class.getMethod("getReturnType");
 
 print(RewriteException);
diff --git a/test/nashorn/script/trusted/event_queue.js.EXPECTED b/test/nashorn/script/trusted/event_queue.js.EXPECTED
index d4eb7299e..47aac4ef0 100644
--- a/test/nashorn/script/trusted/event_queue.js.EXPECTED
+++ b/test/nashorn/script/trusted/event_queue.js.EXPECTED
@@ -1,7 +1,7 @@
 [object Debug]
 
-[JavaClass jdk.nashorn.internal.runtime.events.RuntimeEvent]
-[JavaClass jdk.nashorn.internal.runtime.RewriteException]
+[JavaClass org.openjdk.nashorn.internal.runtime.events.RuntimeEvent]
+[JavaClass org.openjdk.nashorn.internal.runtime.RewriteException]
 
 4.840000000000001
 13.7
@@ -10,26 +10,26 @@ Done with 2 in the event queue
 events = true
 events.length = 2
 event #0
-	event class=class jdk.nashorn.internal.runtime.events.RecompilationEvent
-	valueClass in event=class jdk.nashorn.internal.runtime.RewriteException
-	class of value=class jdk.nashorn.internal.runtime.RewriteException
+	event class=class org.openjdk.nashorn.internal.runtime.events.RecompilationEvent
+	valueClass in event=class org.openjdk.nashorn.internal.runtime.RewriteException
+	class of value=class org.openjdk.nashorn.internal.runtime.RewriteException
 	return type=double
 event #1
-	event class=class jdk.nashorn.internal.runtime.events.RecompilationEvent
-	valueClass in event=class jdk.nashorn.internal.runtime.RewriteException
-	class of value=class jdk.nashorn.internal.runtime.RewriteException
+	event class=class org.openjdk.nashorn.internal.runtime.events.RecompilationEvent
+	valueClass in event=class org.openjdk.nashorn.internal.runtime.RewriteException
+	class of value=class org.openjdk.nashorn.internal.runtime.RewriteException
 	return type=double
 
-in loop last class = class jdk.nashorn.internal.runtime.events.RecompilationEvent
-in loop last value class = class jdk.nashorn.internal.runtime.RewriteException
-in loop rex class = class jdk.nashorn.internal.runtime.RewriteException
+in loop last class = class org.openjdk.nashorn.internal.runtime.events.RecompilationEvent
+in loop last value class = class org.openjdk.nashorn.internal.runtime.RewriteException
+in loop rex class = class org.openjdk.nashorn.internal.runtime.RewriteException
 in loop rex return type = double
 
 true
 
-last class = class jdk.nashorn.internal.runtime.events.RecompilationEvent
-last value class = class jdk.nashorn.internal.runtime.RewriteException
-rex class = class jdk.nashorn.internal.runtime.RewriteException
+last class = class org.openjdk.nashorn.internal.runtime.events.RecompilationEvent
+last value class = class org.openjdk.nashorn.internal.runtime.RewriteException
+rex class = class org.openjdk.nashorn.internal.runtime.RewriteException
 rex return type = object
 
 1024
diff --git a/test/nashorn/script/trusted/optimistic_recompilation.js b/test/nashorn/script/trusted/optimistic_recompilation.js
index 1037133b1..7a1523978 100644
--- a/test/nashorn/script/trusted/optimistic_recompilation.js
+++ b/test/nashorn/script/trusted/optimistic_recompilation.js
@@ -32,13 +32,13 @@
  * @run
  */
 
-var Reflector     = Java.type("jdk.nashorn.test.models.Reflector");
+var Reflector     = Java.type("org.openjdk.nashorn.test.models.Reflector");
 var forName       = java.lang.Class["forName(String)"];
-var RuntimeEvent  = forName("jdk.nashorn.internal.runtime.events.RuntimeEvent").static;
+var RuntimeEvent  = forName("org.openjdk.nashorn.internal.runtime.events.RuntimeEvent").static;
 var getValue      = RuntimeEvent.class.getMethod("getValue");
-var RewriteException = forName("jdk.nashorn.internal.runtime.RewriteException").static;
+var RewriteException = forName("org.openjdk.nashorn.internal.runtime.RewriteException").static;
 var getReturnType    = RewriteException.class.getMethod("getReturnType");
-var RecompilationEvent = forName("jdk.nashorn.internal.runtime.events.RecompilationEvent").static;
+var RecompilationEvent = forName("org.openjdk.nashorn.internal.runtime.events.RecompilationEvent").static;
 var getReturnValue     = RecompilationEvent.class.getMethod("getReturnValue");
 var setReturnTypeAndValue = [];
 var expectedValues = [];
diff --git a/test/nashorn/script/trusted/urlreader.js b/test/nashorn/script/trusted/urlreader.js
index ca037306d..bf4477237 100644
--- a/test/nashorn/script/trusted/urlreader.js
+++ b/test/nashorn/script/trusted/urlreader.js
@@ -5,11 +5,11 @@
  * @run
  */
 
-var URLReader = Java.type("jdk.nashorn.api.scripting.URLReader");
+var URLReader = Java.type("org.openjdk.nashorn.api.scripting.URLReader");
 var URL = Java.type("java.net.URL");
 var File = Java.type("java.io.File");
 var JString = Java.type("java.lang.String");
-var SourceHelper = Java.type("jdk.nashorn.test.models.SourceHelper");
+var SourceHelper = Java.type("org.openjdk.nashorn.test.models.SourceHelper");
 
 var url = new File(__FILE__).toURI().toURL();
 var reader = new URLReader(url);
diff --git a/test/nashorn/src/META-INF/services/java.sql.Driver b/test/nashorn/src/META-INF/services/java.sql.Driver
index d1bb7d332..6f24a8d30 100644
--- a/test/nashorn/src/META-INF/services/java.sql.Driver
+++ b/test/nashorn/src/META-INF/services/java.sql.Driver
@@ -1 +1 @@
-jdk.nashorn.api.test.NashornSQLDriver
+org.openjdk.nashorn.api.test.NashornSQLDriver
diff --git a/test/nashorn/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter b/test/nashorn/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter
index b3f34fe10..e3fb28b95 100644
--- a/test/nashorn/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter
+++ b/test/nashorn/src/META-INF/services/jdk.dynalink.linker.GuardingDynamicLinkerExporter
@@ -1,3 +1,3 @@
-jdk.dynalink.test.UntrustedGuardingDynamicLinkerExporter
-jdk.dynalink.test.TrustedGuardingDynamicLinkerExporter
-jdk.dynalink.test.TrustedUnderscoreNameLinkerExporter
+org.openjdk.dynalink.test.UntrustedGuardingDynamicLinkerExporter
+org.openjdk.dynalink.test.TrustedGuardingDynamicLinkerExporter
+org.openjdk.dynalink.test.TrustedUnderscoreNameLinkerExporter
diff --git a/test/nashorn/src/jdk/dynalink/beans/test/BeanLinkerTest.java b/test/nashorn/src/org/openjdk/dynalink/beans/test/BeanLinkerTest.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/beans/test/BeanLinkerTest.java
rename to test/nashorn/src/org/openjdk/dynalink/beans/test/BeanLinkerTest.java
index 47da785c2..25325bbfc 100644
--- a/test/nashorn/src/jdk/dynalink/beans/test/BeanLinkerTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/beans/test/BeanLinkerTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.dynalink.beans.test;
+package org.openjdk.dynalink.beans.test;
 
 import static jdk.dynalink.StandardNamespace.ELEMENT;
 import static jdk.dynalink.StandardNamespace.METHOD;
diff --git a/test/nashorn/src/jdk/dynalink/beans/test/BeansLinkerTest.java b/test/nashorn/src/org/openjdk/dynalink/beans/test/BeansLinkerTest.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/beans/test/BeansLinkerTest.java
rename to test/nashorn/src/org/openjdk/dynalink/beans/test/BeansLinkerTest.java
index b5b45dcdc..5a9bd1f6c 100644
--- a/test/nashorn/src/jdk/dynalink/beans/test/BeansLinkerTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/beans/test/BeansLinkerTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.dynalink.beans.test;
+package org.openjdk.dynalink.beans.test;
 
 import static jdk.dynalink.StandardNamespace.ELEMENT;
 import static jdk.dynalink.StandardNamespace.METHOD;
diff --git a/test/nashorn/src/jdk/dynalink/beans/test/CallerSensitiveTest.java b/test/nashorn/src/org/openjdk/dynalink/beans/test/CallerSensitiveTest.java
similarity index 93%
rename from test/nashorn/src/jdk/dynalink/beans/test/CallerSensitiveTest.java
rename to test/nashorn/src/org/openjdk/dynalink/beans/test/CallerSensitiveTest.java
index 68656c7d0..c3834df92 100644
--- a/test/nashorn/src/jdk/dynalink/beans/test/CallerSensitiveTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/beans/test/CallerSensitiveTest.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.dynalink.beans.test;
+package org.openjdk.dynalink.beans.test;
 
 import jdk.dynalink.beans.BeansLinker;
-import jdk.nashorn.test.models.ClassLoaderAware;
+import org.openjdk.nashorn.test.models.ClassLoaderAware;
 import org.testng.annotations.Test;
 
 @SuppressWarnings("javadoc")
diff --git a/test/nashorn/src/jdk/dynalink/linker/support/test/LookupTest.java b/test/nashorn/src/org/openjdk/dynalink/linker/support/test/LookupTest.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/linker/support/test/LookupTest.java
rename to test/nashorn/src/org/openjdk/dynalink/linker/support/test/LookupTest.java
index 79f4af49c..04f954b64 100644
--- a/test/nashorn/src/jdk/dynalink/linker/support/test/LookupTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/linker/support/test/LookupTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.dynalink.linker.support.test;
+package org.openjdk.dynalink.linker.support.test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/test/nashorn/src/jdk/dynalink/support/test/CallSiteTest.java b/test/nashorn/src/org/openjdk/dynalink/support/test/CallSiteTest.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/support/test/CallSiteTest.java
rename to test/nashorn/src/org/openjdk/dynalink/support/test/CallSiteTest.java
index 2649a9940..81b60f85f 100644
--- a/test/nashorn/src/jdk/dynalink/support/test/CallSiteTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/support/test/CallSiteTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.dynalink.support.test;
+package org.openjdk.dynalink.support.test;
 
 import static jdk.dynalink.StandardNamespace.PROPERTY;
 import static jdk.dynalink.StandardOperation.GET;
diff --git a/test/nashorn/src/jdk/dynalink/test/ArrayRunnableTest.java b/test/nashorn/src/org/openjdk/dynalink/test/ArrayRunnableTest.java
similarity index 97%
rename from test/nashorn/src/jdk/dynalink/test/ArrayRunnableTest.java
rename to test/nashorn/src/org/openjdk/dynalink/test/ArrayRunnableTest.java
index a38d8e887..a844e1a2d 100644
--- a/test/nashorn/src/jdk/dynalink/test/ArrayRunnableTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/test/ArrayRunnableTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.dynalink.test;
+package org.openjdk.dynalink.test;
 
 public class ArrayRunnableTest {
     private Runnable[] r;
diff --git a/test/nashorn/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java b/test/nashorn/src/org/openjdk/dynalink/test/DynamicLinkerFactoryTest.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java
rename to test/nashorn/src/org/openjdk/dynalink/test/DynamicLinkerFactoryTest.java
index 4199da2cd..b2f2aaa5d 100644
--- a/test/nashorn/src/jdk/dynalink/test/DynamicLinkerFactoryTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/test/DynamicLinkerFactoryTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.dynalink.test;
+package org.openjdk.dynalink.test;
 
 import static jdk.dynalink.StandardNamespace.PROPERTY;
 import static jdk.dynalink.StandardOperation.GET;
@@ -48,7 +48,7 @@
 import jdk.dynalink.linker.LinkRequest;
 import jdk.dynalink.linker.LinkerServices;
 import jdk.dynalink.support.SimpleRelinkableCallSite;
-import jdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/test/nashorn/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java b/test/nashorn/src/org/openjdk/dynalink/test/LinkedCallSiteLocationTest.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java
rename to test/nashorn/src/org/openjdk/dynalink/test/LinkedCallSiteLocationTest.java
index 00b56ba9a..354448465 100644
--- a/test/nashorn/src/jdk/dynalink/test/LinkedCallSiteLocationTest.java
+++ b/test/nashorn/src/org/openjdk/dynalink/test/LinkedCallSiteLocationTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.dynalink.test;
+package org.openjdk.dynalink.test;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
diff --git a/test/nashorn/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java b/test/nashorn/src/org/openjdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java
similarity index 98%
rename from test/nashorn/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java
rename to test/nashorn/src/org/openjdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java
index e9119440a..84b5e2b6d 100644
--- a/test/nashorn/src/jdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java
+++ b/test/nashorn/src/org/openjdk/dynalink/test/TrustedGuardingDynamicLinkerExporter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.dynalink.test;
+package org.openjdk.dynalink.test;
 
 import java.util.List;
 import jdk.dynalink.CallSiteDescriptor;
diff --git a/test/nashorn/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java b/test/nashorn/src/org/openjdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java
similarity index 99%
rename from test/nashorn/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java
rename to test/nashorn/src/org/openjdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java
index 9b21da502..8217130e5 100644
--- a/test/nashorn/src/jdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java
+++ b/test/nashorn/src/org/openjdk/dynalink/test/TrustedUnderscoreNameLinkerExporter.java
@@ -29,7 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package jdk.dynalink.test;
+package org.openjdk.dynalink.test;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
diff --git a/test/nashorn/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java b/test/nashorn/src/org/openjdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java
similarity index 97%
rename from test/nashorn/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java
rename to test/nashorn/src/org/openjdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java
index 4b5496613..6571026ab 100644
--- a/test/nashorn/src/jdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java
+++ b/test/nashorn/src/org/openjdk/dynalink/test/UntrustedGuardingDynamicLinkerExporter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.dynalink.test;
+package org.openjdk.dynalink.test;
 
 import java.util.List;
 import jdk.dynalink.linker.GuardingDynamicLinker;
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ArrayConversionTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ArrayConversionTest.java
index 56ed51eb1..fbe7131f5 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ArrayConversionTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ArrayConversionTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
@@ -42,7 +42,7 @@
 
 /**
  * @test
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.ArrayConversionTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.ArrayConversionTest
  */
 @SuppressWarnings("javadoc")
 public class ArrayConversionTest {
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/BooleanAccessTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/BooleanAccessTest.java
index 803041987..5f3f936b1 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/BooleanAccessTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/BooleanAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
@@ -38,8 +38,8 @@
 
 /**
  * @test
- * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.BooleanAccessTest
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.BooleanAccessTest
+ * @build org.openjdk.nashorn.api.javaaccess.test.SharedObject org.openjdk.nashorn.api.javaaccess.test.Person org.openjdk.nashorn.api.javaaccess.test.BooleanAccessTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.BooleanAccessTest
  */
 @SuppressWarnings("javadoc")
 public class BooleanAccessTest {
@@ -57,7 +57,7 @@ public static void setUpClass() throws ScriptException {
         e = m.getEngineByName("nashorn");
         o = new SharedObject();
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;");
+        e.eval("var SharedObject = Packages.org.openjdk.nashorn.api.javaaccess.test.SharedObject;");
     }
 
     @AfterClass
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ConsStringTest.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ConsStringTest.java
index 0ea533744..13fcd80cd 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ConsStringTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ConsStringTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import java.util.HashMap;
@@ -33,7 +33,7 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.JSObject;
 import org.testng.TestNG;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -41,7 +41,7 @@
 
 /**
  * @test
- * @run testng jdk.nashorn.api.javaaccess.test.ConsStringTest
+ * @run testng org.openjdk.nashorn.api.javaaccess.test.ConsStringTest
  */
 @SuppressWarnings("javadoc")
 public class ConsStringTest {
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/MethodAccessTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/MethodAccessTest.java
index ba3460da6..9a36dcc44 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/MethodAccessTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/MethodAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
@@ -41,8 +41,8 @@
 
 /**
  * @test
- * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.MethodAccessTest
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.MethodAccessTest
+ * @build org.openjdk.nashorn.api.javaaccess.test.SharedObject org.openjdk.nashorn.api.javaaccess.test.Person org.openjdk.nashorn.api.javaaccess.test.MethodAccessTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.MethodAccessTest
  */
 @SuppressWarnings("javadoc")
 public class MethodAccessTest {
@@ -61,8 +61,8 @@ public static void setUpClass() throws ScriptException {
         o = new SharedObject();
         o.setEngine(e);
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;");
-        e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.test.Person;");
+        e.eval("var SharedObject = Packages.org.openjdk.nashorn.api.javaaccess.test.SharedObject;");
+        e.eval("var Person = Packages.org.openjdk.nashorn.api.javaaccess.test.Person;");
     }
 
     @AfterClass
@@ -338,13 +338,13 @@ public void accessMethodObjectArray() throws ScriptException {
 
     @Test
     public void accessDefaultConstructor() throws ScriptException {
-        e.eval("var dc = new Packages.jdk.nashorn.api.javaaccess.test.Person()");
+        e.eval("var dc = new Packages.org.openjdk.nashorn.api.javaaccess.test.Person()");
         assertEquals(new Person(), e.get("dc"));
     }
 
     @Test
     public void accessCustomConstructor() throws ScriptException {
-        e.eval("var cc = new Packages.jdk.nashorn.api.javaaccess.test.Person(17)");
+        e.eval("var cc = new Packages.org.openjdk.nashorn.api.javaaccess.test.Person(17)");
         assertEquals(new Person(17), e.get("cc"));
     }
 
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/NumberAccessTest.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/NumberAccessTest.java
index f64e79b02..d91445c61 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberAccessTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/NumberAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
@@ -38,8 +38,8 @@
 
 /**
  * @test
- * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.NumberAccessTest
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.NumberAccessTest
+ * @build org.openjdk.nashorn.api.javaaccess.test.SharedObject org.openjdk.nashorn.api.javaaccess.test.Person org.openjdk.nashorn.api.javaaccess.test.NumberAccessTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.NumberAccessTest
  */
 @SuppressWarnings("javadoc")
 public class NumberAccessTest {
@@ -57,7 +57,7 @@ public static void setUpClass() throws ScriptException {
         e = m.getEngineByName("nashorn");
         o = new SharedObject();
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;");
+        e.eval("var SharedObject = Packages.org.openjdk.nashorn.api.javaaccess.test.SharedObject;");
     }
 
     @AfterClass
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/NumberBoxingTest.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/NumberBoxingTest.java
index 4a6f3e2c9..88ea89c9b 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/NumberBoxingTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/NumberBoxingTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
@@ -37,8 +37,8 @@
 
 /**
  * @test
- * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.NumberBoxingTest
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.NumberBoxingTest
+ * @build org.openjdk.nashorn.api.javaaccess.test.SharedObject org.openjdk.nashorn.api.javaaccess.test.Person org.openjdk.nashorn.api.javaaccess.test.NumberBoxingTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.NumberBoxingTest
  */
 @SuppressWarnings("javadoc")
 public class NumberBoxingTest {
@@ -56,7 +56,7 @@ public static void setUpClass() throws ScriptException {
         e = m.getEngineByName("nashorn");
         o = new SharedObject();
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;");
+        e.eval("var SharedObject = Packages.org.openjdk.nashorn.api.javaaccess.test.SharedObject;");
     }
 
     @AfterClass
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ObjectAccessTest.java
similarity index 88%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ObjectAccessTest.java
index 80a325e4c..f3b5fffa6 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/ObjectAccessTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/ObjectAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
@@ -37,8 +37,8 @@
 
 /**
  * @test
- * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.ObjectAccessTest
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.ObjectAccessTest
+ * @build org.openjdk.nashorn.api.javaaccess.test.SharedObject org.openjdk.nashorn.api.javaaccess.test.Person org.openjdk.nashorn.api.javaaccess.test.ObjectAccessTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.ObjectAccessTest
  */
 @SuppressWarnings("javadoc")
 public class ObjectAccessTest {
@@ -56,8 +56,8 @@ public static void setUpClass() throws ScriptException {
         e = m.getEngineByName("nashorn");
         o = new SharedObject();
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;");
-        e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.test.Person;");
+        e.eval("var SharedObject = Packages.org.openjdk.nashorn.api.javaaccess.test.SharedObject;");
+        e.eval("var Person = Packages.org.openjdk.nashorn.api.javaaccess.test.Person;");
     }
 
     @AfterClass
@@ -80,7 +80,7 @@ public void accessFieldObjectArray() throws ScriptException {
         e.eval("var p_object_array = o.publicObjectArray;");
         assertEquals(o.publicObjectArray[0], e.eval("o.publicObjectArray[0]"));
         assertArrayEquals(o.publicObjectArray, (Object[])e.get("p_object_array"));
-        e.eval("var t_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
+        e.eval("var t_object_arr = new (Java.type(\"org.openjdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
                 "t_object_arr[0] = new Person(100);" +
                 "t_object_arr[1] = new Person(120);" +
                 "t_object_arr[2] = new Person(140);" +
@@ -104,7 +104,7 @@ public void accessStaticFieldObjectArray() throws ScriptException {
         e.eval("var ps_object_array = SharedObject.publicStaticObjectArray;");
         assertEquals(SharedObject.publicStaticObjectArray[0], e.eval("SharedObject.publicStaticObjectArray[0]"));
         assertArrayEquals(SharedObject.publicStaticObjectArray, (Object[])e.get("ps_object_array"));
-        e.eval("var ts_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
+        e.eval("var ts_object_arr = new (Java.type(\"org.openjdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
                 "ts_object_arr[0] = new Person(100);" +
                 "ts_object_arr[1] = new Person(120);" +
                 "ts_object_arr[2] = new Person(140);" +
@@ -128,7 +128,7 @@ public void accessFinalFieldObjectArray() throws ScriptException {
         e.eval("var pf_object_array = o.publicFinalObjectArray;");
         assertEquals(o.publicFinalObjectArray[0], e.eval("o.publicFinalObjectArray[0]"));
         assertArrayEquals(o.publicFinalObjectArray, (Object[])e.get("pf_object_array"));
-        e.eval("var tf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
+        e.eval("var tf_object_arr = new (Java.type(\"org.openjdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
                 "tf_object_arr[0] = new Person(100);" +
                 "tf_object_arr[1] = new Person(120);" +
                 "tf_object_arr[2] = new Person(140);" +
@@ -152,7 +152,7 @@ public void accessStaticFinalFieldObjectArray() throws ScriptException {
         e.eval("var psf_object_array = SharedObject.publicStaticFinalObjectArray;");
         assertEquals(SharedObject.publicStaticFinalObjectArray[0], e.eval("SharedObject.publicStaticFinalObjectArray[0]"));
         assertArrayEquals(SharedObject.publicStaticFinalObjectArray, (Object[])e.get("psf_object_array"));
-        e.eval("var tsf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
+        e.eval("var tsf_object_arr = new (Java.type(\"org.openjdk.nashorn.api.javaaccess.test.Person[]\"))(3);" +
                 "tsf_object_arr[0] = new Person(100);" +
                 "tsf_object_arr[1] = new Person(120);" +
                 "tsf_object_arr[2] = new Person(140);" +
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/Person.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/Person.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/Person.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/Person.java
index 3e563b111..77fd116ad 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/Person.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/Person.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 @SuppressWarnings("javadoc")
 public class Person {
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/SharedObject.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/SharedObject.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/SharedObject.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/SharedObject.java
index d47b6f2e0..7635b6e92 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/SharedObject.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/SharedObject.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
diff --git a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/StringAccessTest.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/StringAccessTest.java
index 909ddb48a..8781d1516 100644
--- a/test/nashorn/src/jdk/nashorn/api/javaaccess/test/StringAccessTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/javaaccess/test/StringAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.javaaccess.test;
+package org.openjdk.nashorn.api.javaaccess.test;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
@@ -37,8 +37,8 @@
 
 /**
  * @test
- * @build jdk.nashorn.api.javaaccess.test.SharedObject jdk.nashorn.api.javaaccess.test.Person jdk.nashorn.api.javaaccess.test.StringAccessTest
- * @run testng/othervm jdk.nashorn.api.javaaccess.test.StringAccessTest
+ * @build org.openjdk.nashorn.api.javaaccess.test.SharedObject org.openjdk.nashorn.api.javaaccess.test.Person org.openjdk.nashorn.api.javaaccess.test.StringAccessTest
+ * @run testng/othervm org.openjdk.nashorn.api.javaaccess.test.StringAccessTest
  */
 @SuppressWarnings("javadoc")
 public class StringAccessTest {
@@ -56,7 +56,7 @@ public static void setUpClass() throws ScriptException {
         e = m.getEngineByName("nashorn");
         o = new SharedObject();
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.test.SharedObject;");
+        e.eval("var SharedObject = Packages.org.openjdk.nashorn.api.javaaccess.test.SharedObject;");
     }
 
     @AfterClass
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/InvocableTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/InvocableTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/InvocableTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/InvocableTest.java
index 4a84632ea..5dce23647 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/InvocableTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/InvocableTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
@@ -42,8 +42,8 @@
  * Tests for javax.script.Invocable implementation of nashorn.
  *
  * @test
- * @build jdk.nashorn.api.scripting.test.VariableArityTestInterface jdk.nashorn.api.scripting.test.InvocableTest
- * @run testng jdk.nashorn.api.scripting.test.InvocableTest
+ * @build org.openjdk.nashorn.api.scripting.test.VariableArityTestInterface org.openjdk.nashorn.api.scripting.test.InvocableTest
+ * @run testng org.openjdk.nashorn.api.scripting.test.InvocableTest
  */
 @SuppressWarnings("javadoc")
 public class InvocableTest {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8068741_Test.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8068741_Test.java
similarity index 92%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8068741_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8068741_Test.java
index 4bfab53ac..77d8ef72f 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8068741_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8068741_Test.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import javax.script.ScriptEngineFactory;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
  * @test
- * @run testng jdk.nashorn.api.scripting.test.JDK_8068741_Test
+ * @run testng org.openjdk.nashorn.api.scripting.test.JDK_8068741_Test
  * @bug 8068741
  * @summary javax.script.ScriptEngineFactory.getMethodCallSyntax() spec allows null passed as an object
  */
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8148140_Test.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8148140_Test.java
index 3003fc078..bea6f806b 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8148140_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8148140_Test.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import java.util.Arrays;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8169050_Test.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8169050_Test.java
index 357b7c449..8375f31e2 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8169050_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8169050_Test.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8182996_Test.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8182996_Test.java
index e4c55d52a..bcb0082d7 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JDK_8182996_Test.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JSONCompatibleTest.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JSONCompatibleTest.java
index 832d7e34e..a8e6ba7e8 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/JSONCompatibleTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/JSONCompatibleTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
@@ -33,15 +33,15 @@
 import java.util.Map;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.NashornScriptEngine;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngine;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
  * @test
- * @run testng jdk.nashorn.api.scripting.test.JSONCompatibleTest
+ * @run testng org.openjdk.nashorn.api.scripting.test.JSONCompatibleTest
  */
 public class JSONCompatibleTest {
 
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/MultipleEngineTest.java
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/MultipleEngineTest.java
index 76982faef..4aa86a801 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/MultipleEngineTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/MultipleEngineTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
@@ -35,7 +35,7 @@
  * independently.
  *
  * @test
- * @run testng jdk.nashorn.api.scripting.test.MultipleEngineTest
+ * @run testng org.openjdk.nashorn.api.scripting.test.MultipleEngineTest
  */
 @SuppressWarnings("javadoc")
 public class MultipleEngineTest {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
index 4e5a8e1a2..ce8995b95 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -38,18 +38,18 @@
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
-import jdk.nashorn.api.scripting.AbstractJSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.testng.annotations.Test;
 
 /**
- * Tests for pluggable external impls. of jdk.nashorn.api.scripting.JSObject.
+ * Tests for pluggable external impls. of org.openjdk.nashorn.api.scripting.JSObject.
  *
  * JDK-8024615: Refactor ScriptObjectMirror and JSObject to support external
  * JSObject implementations.
  *
  * @test
- * @run testng jdk.nashorn.api.scripting.test.PluggableJSObjectTest
+ * @run testng org.openjdk.nashorn.api.scripting.test.PluggableJSObjectTest
  */
 @SuppressWarnings("javadoc")
 public class PluggableJSObjectTest {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScopeTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScopeTest.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/ScopeTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScopeTest.java
index dcff59f88..d17388364 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScopeTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScopeTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -40,9 +40,9 @@
 import javax.script.ScriptException;
 import javax.script.SimpleBindings;
 import javax.script.SimpleScriptContext;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.api.scripting.URLReader;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.URLReader;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -845,7 +845,7 @@ public void megamorphicPropertyReadTest() throws ScriptException {
         boolean ret;
 
         // Why 16 is the upper limit of this loop? The default nashorn dynalink megamorphic threshold is 16.
-        // See jdk.nashorn.internal.runtime.linker.Bootstrap.NASHORN_DEFAULT_UNSTABLE_RELINK_THRESHOLD
+        // See org.openjdk.nashorn.internal.runtime.linker.Bootstrap.NASHORN_DEFAULT_UNSTABLE_RELINK_THRESHOLD
         // We do, 'eval' of the same in this loop twice. So, 16*2 = 32 times that callsite in the script
         // is exercised - much beyond the default megamorphic threshold.
 
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java
index 5d7ab1a07..caa4b2012 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptEngineSecurityTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.fail;
 import java.lang.reflect.InvocationHandler;
@@ -32,15 +32,15 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.annotations.Test;
 
 /**
  * jsr223 tests for security access checks.
  *
  * @test
- * @run testng/othervm jdk.nashorn.api.scripting.test.ScriptEngineSecurityTest
+ * @run testng/othervm org.openjdk.nashorn.api.scripting.test.ScriptEngineSecurityTest
  */
 @SuppressWarnings("javadoc")
 public class ScriptEngineSecurityTest {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptEngineTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptEngineTest.java
index 031df2dc8..40c527d93 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptEngineTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptEngineTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -51,15 +51,15 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.script.SimpleScriptContext;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.testng.annotations.Test;
 
 /**
  * Tests for JSR-223 script engine for Nashorn.
  *
  * @test
- * @build jdk.nashorn.api.scripting.test.Window jdk.nashorn.api.scripting.test.WindowEventHandler jdk.nashorn.api.scripting.test.VariableArityTestInterface jdk.nashorn.api.scripting.test.ScriptEngineTest
- * @run testng/othervm jdk.nashorn.api.scripting.test.ScriptEngineTest
+ * @build org.openjdk.nashorn.api.scripting.test.Window org.openjdk.nashorn.api.scripting.test.WindowEventHandler org.openjdk.nashorn.api.scripting.test.VariableArityTestInterface org.openjdk.nashorn.api.scripting.test.ScriptEngineTest
+ * @run testng/othervm org.openjdk.nashorn.api.scripting.test.ScriptEngineTest
  */
 @SuppressWarnings("javadoc")
 public class ScriptEngineTest {
@@ -542,7 +542,7 @@ public void scriptObjectAutoConversionTest() throws ScriptException {
         final ScriptEngineManager m = new ScriptEngineManager();
         final ScriptEngine e = m.getEngineByName("nashorn");
         e.eval("obj = { foo: 'hello' }");
-        e.put("Window", e.eval("Packages.jdk.nashorn.api.scripting.test.Window"));
+        e.put("Window", e.eval("Packages.org.openjdk.nashorn.api.scripting.test.Window"));
         assertEquals(e.eval("Window.funcJSObject(obj)"), "hello");
         assertEquals(e.eval("Window.funcScriptObjectMirror(obj)"), "hello");
         assertEquals(e.eval("Window.funcMap(obj)"), "hello");
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
index f43c0db2f..9ec98c451 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -41,16 +41,16 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.AbstractJSObject;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.testng.annotations.Test;
 
 /**
- * Tests to check jdk.nashorn.api.scripting.ScriptObjectMirror API.
+ * Tests to check org.openjdk.nashorn.api.scripting.ScriptObjectMirror API.
  *
  * @test
- * @run testng jdk.nashorn.api.scripting.test.ScriptObjectMirrorTest
+ * @run testng org.openjdk.nashorn.api.scripting.test.ScriptObjectMirrorTest
  */
 @SuppressWarnings("javadoc")
 public class ScriptObjectMirrorTest {
@@ -362,7 +362,7 @@ public void mirrorUnwrapInterfaceMethod() throws Exception {
         final ScriptEngine engine = engineManager.getEngineByName("nashorn");
         final Invocable invocable = (Invocable)engine;
         engine.eval("function apply(obj) { " +
-            " return obj instanceof Packages.jdk.nashorn.api.scripting.ScriptObjectMirror; " +
+            " return obj instanceof Packages.org.openjdk.nashorn.api.scripting.ScriptObjectMirror; " +
             "}");
         @SuppressWarnings("unchecked")
         final Function func = invocable.getInterface(Function.class);
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/VariableArityTestInterface.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/VariableArityTestInterface.java
index 7761a3d6e..0dbff0b5e 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/VariableArityTestInterface.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/VariableArityTestInterface.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 @SuppressWarnings("javadoc")
 public interface VariableArityTestInterface {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/Window.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/Window.java
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/Window.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/Window.java
index 6c60b163b..6cdc9a262 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/Window.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/Window.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 import java.util.Map;
 import javax.script.Bindings;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 
 @SuppressWarnings("javadoc")
 public class Window {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/WindowEventHandler.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/WindowEventHandler.java
index ddc879c89..5902dab92 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/WindowEventHandler.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/WindowEventHandler.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.scripting.test;
+package org.openjdk.nashorn.api.scripting.test;
 
 @SuppressWarnings("javadoc")
 public interface WindowEventHandler {
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/func.js b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/func.js
similarity index 92%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/resources/func.js
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/func.js
index 477bd1a64..bc50ccd91 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/func.js
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/func.js
@@ -23,7 +23,7 @@
  * questions.
  */
 
-// This script is loaded from jdk.nashorn.api.scripting.ScopeTest to test script class sharing and reuse.
+// This script is loaded from org.openjdk.nashorn.api.scripting.ScopeTest to test script class sharing and reuse.
 
 var scopeVar = 1;
 var global = this;
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/gettersetter.js
similarity index 92%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/gettersetter.js
index 51e247274..9708f6016 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/gettersetter.js
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/gettersetter.js
@@ -23,7 +23,7 @@
  * questions.
  */
 
-// This script is loaded from jdk.nashorn.api.scripting.ScopeTest to test script class sharing and reuse.
+// This script is loaded from org.openjdk.nashorn.api.scripting.ScopeTest to test script class sharing and reuse.
 
 var v;
 
diff --git a/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/witheval.js b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/witheval.js
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/api/scripting/test/resources/witheval.js
rename to test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/witheval.js
index 6041d5b49..cb9162543 100644
--- a/test/nashorn/src/jdk/nashorn/api/scripting/test/resources/witheval.js
+++ b/test/nashorn/src/org/openjdk/nashorn/api/scripting/test/resources/witheval.js
@@ -23,7 +23,7 @@
  * questions.
  */
 
-// This script is loaded from jdk.nashorn.api.scripting.ScopeTest to test script class sharing and reuse.
+// This script is loaded from org.openjdk.nashorn.api.scripting.ScopeTest to test script class sharing and reuse.
 
 var a;
 
diff --git a/test/nashorn/src/jdk/nashorn/api/test/NashornSQLDriver.java b/test/nashorn/src/org/openjdk/nashorn/api/test/NashornSQLDriver.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/api/test/NashornSQLDriver.java
rename to test/nashorn/src/org/openjdk/nashorn/api/test/NashornSQLDriver.java
index d1a5377f7..ced71a781 100644
--- a/test/nashorn/src/jdk/nashorn/api/test/NashornSQLDriver.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/test/NashornSQLDriver.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.api.test;
+package org.openjdk.nashorn.api.test;
 
 import java.sql.Connection;
 import java.sql.Driver;
diff --git a/test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8188098_Test.java b/test/nashorn/src/org/openjdk/nashorn/api/tree/test/JDK_8188098_Test.java
similarity index 88%
rename from test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8188098_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/api/tree/test/JDK_8188098_Test.java
index 9530d2a09..a7ddea9ee 100644
--- a/test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8188098_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/tree/test/JDK_8188098_Test.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.api.tree.test;
+package org.openjdk.nashorn.api.tree.test;
 
-import jdk.nashorn.api.tree.Parser;
-import jdk.nashorn.api.tree.SimpleTreeVisitorES6;
+import org.openjdk.nashorn.api.tree.Parser;
+import org.openjdk.nashorn.api.tree.SimpleTreeVisitorES6;
 import org.testng.annotations.Test;
 
 /**
  * 8188098: NPE in SimpleTreeVisitorES6 visitor when parsing a tagged template literal
  *
  * @test
- * @run testng jdk.nashorn.api.tree.test.JDK_8188098_Test
+ * @run testng org.openjdk.nashorn.api.tree.test.JDK_8188098_Test
  */
 public class JDK_8188098_Test {
     @Test
diff --git a/test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8193296_Test.java b/test/nashorn/src/org/openjdk/nashorn/api/tree/test/JDK_8193296_Test.java
similarity index 83%
rename from test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8193296_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/api/tree/test/JDK_8193296_Test.java
index e5abab87a..5951ef99e 100644
--- a/test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8193296_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/tree/test/JDK_8193296_Test.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.api.tree.test;
+package org.openjdk.nashorn.api.tree.test;
 
-import jdk.nashorn.api.tree.CompilationUnitTree;
-import jdk.nashorn.api.tree.ExpressionStatementTree;
-import jdk.nashorn.api.tree.FunctionCallTree;
-import jdk.nashorn.api.tree.Parser;
-import jdk.nashorn.api.tree.Tree;
-import jdk.nashorn.api.tree.UnaryTree;
+import org.openjdk.nashorn.api.tree.CompilationUnitTree;
+import org.openjdk.nashorn.api.tree.ExpressionStatementTree;
+import org.openjdk.nashorn.api.tree.FunctionCallTree;
+import org.openjdk.nashorn.api.tree.Parser;
+import org.openjdk.nashorn.api.tree.Tree;
+import org.openjdk.nashorn.api.tree.UnaryTree;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -37,7 +37,7 @@
  * @test
  * @bug 8184723
  * @summary Parser should not eagerly transform delete expressions
- * @run testng jdk.nashorn.api.tree.test.JDK_8193296_Test
+ * @run testng org.openjdk.nashorn.api.tree.test.JDK_8193296_Test
  */
 public class JDK_8193296_Test {
     @Test
diff --git a/test/nashorn/src/jdk/nashorn/api/tree/test/ParseAPITest.java b/test/nashorn/src/org/openjdk/nashorn/api/tree/test/ParseAPITest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/api/tree/test/ParseAPITest.java
rename to test/nashorn/src/org/openjdk/nashorn/api/tree/test/ParseAPITest.java
index c13a4c1cc..a9c1ac508 100644
--- a/test/nashorn/src/jdk/nashorn/api/tree/test/ParseAPITest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/api/tree/test/ParseAPITest.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.api.tree.test;
+package org.openjdk.nashorn.api.tree.test;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import jdk.nashorn.api.tree.Parser;
-import jdk.nashorn.api.tree.SimpleTreeVisitorES5_1;
-import jdk.nashorn.api.tree.Tree;
+import org.openjdk.nashorn.api.tree.Parser;
+import org.openjdk.nashorn.api.tree.SimpleTreeVisitorES5_1;
+import org.openjdk.nashorn.api.tree.Tree;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
- * Test for nashorn Parser API (jdk.nashorn.api.tree.*)
+ * Test for nashorn Parser API (org.openjdk.nashorn.api.tree.*)
  *
  * @test
- * @run testng jdk.nashorn.api.tree.test.ParseAPITest
+ * @run testng org.openjdk.nashorn.api.tree.test.ParseAPITest
  */
 public class ParseAPITest {
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/codegen/test/CompilerTest.java
similarity index 92%
rename from test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/codegen/test/CompilerTest.java
index 998d2aa3f..825267a32 100644
--- a/test/nashorn/src/jdk/nashorn/internal/codegen/test/CompilerTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/codegen/test/CompilerTest.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.test;
+package org.openjdk.nashorn.internal.codegen.test;
 
-import static jdk.nashorn.internal.runtime.Source.readFully;
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.Source.readFully;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
diff --git a/test/nashorn/src/jdk/nashorn/internal/parser/test/ParserTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/parser/test/ParserTest.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/parser/test/ParserTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/parser/test/ParserTest.java
index 17259cc96..1416a6902 100644
--- a/test/nashorn/src/jdk/nashorn/internal/parser/test/ParserTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/parser/test/ParserTest.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser.test;
+package org.openjdk.nashorn.internal.parser.test;
 
-import static jdk.nashorn.internal.runtime.Source.readFully;
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.Source.readFully;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 import java.io.File;
-import jdk.nashorn.internal.parser.Parser;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.parser.Parser;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
diff --git a/test/nashorn/src/jdk/nashorn/internal/performance/AuroraWrapper.java b/test/nashorn/src/org/openjdk/nashorn/internal/performance/AuroraWrapper.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/internal/performance/AuroraWrapper.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/performance/AuroraWrapper.java
index ccc3930e0..83dc38e7b 100644
--- a/test/nashorn/src/jdk/nashorn/internal/performance/AuroraWrapper.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/performance/AuroraWrapper.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.performance;
+package org.openjdk.nashorn.internal.performance;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/test/nashorn/src/jdk/nashorn/internal/performance/OctaneTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/performance/OctaneTest.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/internal/performance/OctaneTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/performance/OctaneTest.java
index cbb016f5a..4c3a04e8d 100644
--- a/test/nashorn/src/jdk/nashorn/internal/performance/OctaneTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/performance/OctaneTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.performance;
+package org.openjdk.nashorn.internal.performance;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
diff --git a/test/nashorn/src/jdk/nashorn/internal/performance/PerformanceWrapper.java b/test/nashorn/src/org/openjdk/nashorn/internal/performance/PerformanceWrapper.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/performance/PerformanceWrapper.java
index cd3d322b7..f020c79eb 100644
--- a/test/nashorn/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/performance/PerformanceWrapper.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.performance;
+package org.openjdk.nashorn.internal.performance;
 
 import java.io.OutputStream;
 import java.util.concurrent.Callable;
@@ -31,13 +31,13 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 
 @SuppressWarnings("javadoc")
-public class PerformanceWrapper extends jdk.nashorn.tools.Shell {
+public class PerformanceWrapper extends org.openjdk.nashorn.tools.Shell {
 
     int _numberOfIterations;
     int _runsPerIteration;
@@ -86,7 +86,7 @@ protected void runExecuteOnlyTest(final String name, final int numberOfIteration
     @Override
     protected Object apply(final ScriptFunction target, final Object self) {
         if (_runsPerIteration == 0 && _numberOfIterations == 0) {
-            final Global global = jdk.nashorn.internal.runtime.Context.getGlobal();
+            final Global global = org.openjdk.nashorn.internal.runtime.Context.getGlobal();
             final ScriptFunction _target = target;
             final Object _self = self;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/performance/SplayTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/performance/SplayTest.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/internal/performance/SplayTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/performance/SplayTest.java
index d80b1aa2d..5d68ffd4f 100644
--- a/test/nashorn/src/jdk/nashorn/internal/performance/SplayTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/performance/SplayTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.performance;
+package org.openjdk.nashorn.internal.performance;
 
 import org.testng.annotations.Test;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java
index 3f0e7b351..db8a1d408 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/BignumDtoaTest.java
@@ -55,13 +55,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv.test;
+package org.openjdk.nashorn.internal.runtime.doubleconv.test;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import jdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
-import jdk.nashorn.internal.runtime.doubleconv.DtoaBuffer;
-import jdk.nashorn.internal.runtime.doubleconv.DtoaMode;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DtoaBuffer;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DtoaMode;
 
 import org.testng.annotations.Test;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java
index 9e2dc7db6..aaf777b4b 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/BignumTest.java
@@ -55,7 +55,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv.test;
+package org.openjdk.nashorn.internal.runtime.doubleconv.test;
 
 import org.testng.annotations.Test;
 
@@ -69,8 +69,8 @@
  * Bignum class tests
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.doubleconv:open
- * @run testng jdk.nashorn.internal.runtime.doubleconv.test.BignumTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.doubleconv:open
+ * @run testng org.openjdk.nashorn.internal.runtime.doubleconv.test.BignumTest
  */
 @SuppressWarnings("javadoc")
 public class BignumTest {
@@ -80,7 +80,7 @@ public class BignumTest {
 
     static {
         try {
-            Bignum = Class.forName("jdk.nashorn.internal.runtime.doubleconv.Bignum");
+            Bignum = Class.forName("org.openjdk.nashorn.internal.runtime.doubleconv.Bignum");
             ctor = Bignum.getDeclaredConstructor();
             ctor.setAccessible(true);
         } catch (final Exception e) {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java
index 662e380da..e6fcc4fc6 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/DiyFpTest.java
@@ -30,7 +30,7 @@
 //
 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 
-package jdk.nashorn.internal.runtime.doubleconv.test;
+package org.openjdk.nashorn.internal.runtime.doubleconv.test;
 
 import org.testng.annotations.Test;
 
@@ -44,8 +44,8 @@
  * DiyFp class tests
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.doubleconv:open
- * @run testng jdk.nashorn.internal.runtime.doubleconv.test.DiyFpTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.doubleconv:open
+ * @run testng org.openjdk.nashorn.internal.runtime.doubleconv.test.DiyFpTest
  */
 @SuppressWarnings("javadoc")
 public class DiyFpTest {
@@ -55,7 +55,7 @@ public class DiyFpTest {
 
     static {
         try {
-            DiyFp = Class.forName("jdk.nashorn.internal.runtime.doubleconv.DiyFp");
+            DiyFp = Class.forName("org.openjdk.nashorn.internal.runtime.doubleconv.DiyFp");
             ctor = DiyFp.getDeclaredConstructor(long.class, int.class);
             ctor.setAccessible(true);
         } catch (final Exception e) {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java
index e70d533a3..6c2bf6000 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/FastDtoaTest.java
@@ -30,14 +30,14 @@
 //
 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 
-package jdk.nashorn.internal.runtime.doubleconv.test;
+package org.openjdk.nashorn.internal.runtime.doubleconv.test;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import jdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
-import jdk.nashorn.internal.runtime.doubleconv.DtoaBuffer;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DtoaBuffer;
 
 import org.testng.annotations.Test;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java
index 1f68ae8be..d01c113bd 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/FixedDtoaTest.java
@@ -55,13 +55,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package jdk.nashorn.internal.runtime.doubleconv.test;
+package org.openjdk.nashorn.internal.runtime.doubleconv.test;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.concurrent.atomic.AtomicInteger;
-import jdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
-import jdk.nashorn.internal.runtime.doubleconv.DtoaBuffer;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DoubleConversion;
+import org.openjdk.nashorn.internal.runtime.doubleconv.DtoaBuffer;
 
 import org.testng.annotations.Test;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java
index 24b64df78..5d19119ac 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/IeeeDoubleTest.java
@@ -30,7 +30,7 @@
 //
 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 
-package jdk.nashorn.internal.runtime.doubleconv.test;
+package org.openjdk.nashorn.internal.runtime.doubleconv.test;
 
 import org.testng.annotations.Test;
 
@@ -44,8 +44,8 @@
  * IeeeDouble tests
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.doubleconv:open
- * @run testng jdk.nashorn.internal.runtime.doubleconv.test.IeeeDoubleTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.doubleconv:open
+ * @run testng org.openjdk.nashorn.internal.runtime.doubleconv.test.IeeeDoubleTest
  */
 @SuppressWarnings({"unchecked", "javadoc"})
 public class IeeeDoubleTest {
@@ -71,8 +71,8 @@ public class IeeeDoubleTest {
 
     static {
         try {
-            final Class IeeeDouble = Class.forName("jdk.nashorn.internal.runtime.doubleconv.IeeeDouble");
-            final Class DiyFp = Class.forName("jdk.nashorn.internal.runtime.doubleconv.DiyFp");
+            final Class IeeeDouble = Class.forName("org.openjdk.nashorn.internal.runtime.doubleconv.IeeeDouble");
+            final Class DiyFp = Class.forName("org.openjdk.nashorn.internal.runtime.doubleconv.DiyFp");
             asDiyFp = method(IeeeDouble, "asDiyFp", long.class);
             asNormalizedDiyFp = method(IeeeDouble, "asNormalizedDiyFp", long.class);
             doubleToLong = method(IeeeDouble, "doubleToLong", double.class);
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt
similarity index 100%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/resources/gay-fixed.txt
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt
similarity index 100%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/resources/gay-precision.txt
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt
similarity index 100%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/doubleconv/test/resources/gay-shortest.txt
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java
similarity index 77%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java
index 9e5ef1b3a..05a8a4a4d 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker.test;
+package org.openjdk.nashorn.internal.runtime.linker.test;
 
-import jdk.nashorn.api.scripting.AbstractJSObject;
-import jdk.nashorn.api.scripting.NashornScriptEngine;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngine;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 
 /**
  * @test
  * @bug 8184723
- * @summary jdk.nashorn.internal.runtime.linker.JSObjectLinker.callToApply erroneously asserts given arguments
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.linker
- * @run main/othervm -ea jdk.nashorn.internal.runtime.linker.test.JDK_8184723_Test
+ * @summary org.openjdk.nashorn.internal.runtime.linker.JSObjectLinker.callToApply erroneously asserts given arguments
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.linker
+ * @run main/othervm -ea org.openjdk.nashorn.internal.runtime.linker.test.JDK_8184723_Test
  */
 
 public class JDK_8184723_Test {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java
index ad82e5feb..e2032f2b5 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/JavaAdapterTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.linker.test;
+package org.openjdk.nashorn.internal.runtime.linker.test;
 
 import java.util.Collection;
 import java.util.Deque;
@@ -35,11 +35,11 @@
 import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.NashornScriptEngine;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngine;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.runtime.Context;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -291,8 +291,8 @@ public static void testMirrorAdapter() throws ScriptException {
         e.eval("function convertObjectFromGlobalScope(){ return new java.util.concurrent.Callable(o).call(); }", e.getBindings(ScriptContext.GLOBAL_SCOPE));
         e.eval("function convertFuncFromEngineScope(){ return new java.util.concurrent.Callable(g).call(); }", e.getBindings(ScriptContext.ENGINE_SCOPE));
         e.eval("function convertFuncFromGlobalScope(){ return new java.util.concurrent.Callable(g).call(); }", e.getBindings(ScriptContext.GLOBAL_SCOPE));
-        e.eval("function convertParamFromEngineScope(){ return Java.type('jdk.nashorn.internal.runtime.linker.test.JavaAdapterTest').m(f);}", e.getBindings(ScriptContext.ENGINE_SCOPE));
-        e.eval("function convertParamFromGlobalScope(){ return Java.type('jdk.nashorn.internal.runtime.linker.test.JavaAdapterTest').m(f);}", e.getBindings(ScriptContext.GLOBAL_SCOPE));
+        e.eval("function convertParamFromEngineScope(){ return Java.type('org.openjdk.nashorn.internal.runtime.linker.test.JavaAdapterTest').m(f);}", e.getBindings(ScriptContext.ENGINE_SCOPE));
+        e.eval("function convertParamFromGlobalScope(){ return Java.type('org.openjdk.nashorn.internal.runtime.linker.test.JavaAdapterTest').m(f);}", e.getBindings(ScriptContext.GLOBAL_SCOPE));
 
         e.eval("var o = { call: function () { return 'ok from o'; } }", e.getBindings(ScriptContext.ENGINE_SCOPE));
         e.eval("function g() { return 'ok from g'; }", e.getBindings(ScriptContext.ENGINE_SCOPE));
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/NameCodecTest.java
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/NameCodecTest.java
index 2358a686c..df3fb05da 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/linker/test/NameCodecTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/linker/test/NameCodecTest.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.linker.test;
+package org.openjdk.nashorn.internal.runtime.linker.test;
 
 import static org.testng.Assert.assertEquals;
 
-import jdk.nashorn.internal.runtime.linker.NameCodec;
+import org.openjdk.nashorn.internal.runtime.linker.NameCodec;
 import org.testng.annotations.Test;
 
 /**
- * Test for jdk.nashorn.intenal.runtime.linker.NameCodec.java. This test is
+ * Test for org.openjdk.nashorn.intenal.runtime.linker.NameCodec.java. This test is
  * derived from BytecodeNameTest.java from (older) mlvm code @
  * http://hg.openjdk.java.net/mlvm/mlvm/file/tip/netbeans/meth/test/sun/invoke/util/BytecodeNameTest.java
  *
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java
similarity index 87%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java
index 27ffd841e..e10a7638f 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/regexp/joni/test/JoniTest.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp.joni.test;
+package org.openjdk.nashorn.internal.runtime.regexp.joni.test;
 
-import jdk.nashorn.internal.runtime.regexp.joni.Regex;
+import org.openjdk.nashorn.internal.runtime.regexp.joni.Regex;
 import org.testng.annotations.Test;
 
 /**
  * Joni coverage tests
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.regexp.joni
- * @run testng jdk.nashorn.internal.runtime.regexp.joni.test.JoniTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.regexp.joni
+ * @run testng org.openjdk.nashorn.internal.runtime.regexp.joni.test.JoniTest
  */
 @SuppressWarnings("javadoc")
 public class JoniTest {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java
similarity index 84%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java
index 32d5d42ac..f73dec27e 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/regexp/test/JdkRegExpTest.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.regexp.test;
+package org.openjdk.nashorn.internal.runtime.regexp.test;
 
-import jdk.nashorn.internal.runtime.regexp.RegExp;
-import jdk.nashorn.internal.runtime.regexp.RegExpFactory;
-import jdk.nashorn.internal.runtime.regexp.RegExpMatcher;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExp;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpFactory;
+import org.openjdk.nashorn.internal.runtime.regexp.RegExpMatcher;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
@@ -38,8 +38,8 @@
  * Basic tests for the JDK based RegExp implementation.
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.regexp
- * @run testng jdk.nashorn.internal.runtime.regexp.test.JdkRegExpTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.regexp
+ * @run testng org.openjdk.nashorn.internal.runtime.regexp.test.JdkRegExpTest
  */
 public class JdkRegExpTest {
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java
index 3115e181e..8b35ee870 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/AddAndRemoveOnListAdapterOutsideOfJavaScriptContextTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertEquals;
 
@@ -32,7 +32,7 @@
 import java.util.List;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.annotations.Test;
 
 /**
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ClassFilterTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ClassFilterTest.java
index 3a3349f81..6c98c3dc4 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ClassFilterTest.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import java.io.File;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.api.scripting.URLReader;
-import jdk.nashorn.internal.test.framework.TestFinder;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.URLReader;
+import org.openjdk.nashorn.internal.test.framework.TestFinder;
 import org.testng.annotations.Test;
 
 @SuppressWarnings("javadoc")
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
index ae855c1f3..ab41f8ba7 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -35,14 +35,14 @@
 import java.nio.file.Path;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.annotations.Test;
 
 /**
  * @test
  * @bug 8039185 8039403
  * @summary  Test for persistent code cache and path handling
- * @run testng jdk.nashorn.internal.runtime.test.CodeStoreAndPathTest
+ * @run testng org.openjdk.nashorn.internal.runtime.test.CodeStoreAndPathTest
  */
 @SuppressWarnings("javadoc")
 public class CodeStoreAndPathTest {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ConsStringTest.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ConsStringTest.java
index 12f49028f..50d6af458 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ConsStringTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ConsStringTest.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import jdk.nashorn.internal.runtime.ConsString;
+import org.openjdk.nashorn.internal.runtime.ConsString;
 import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.Test;
@@ -34,8 +34,8 @@
  * Tests for JSType methods.
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @run testng jdk.nashorn.internal.runtime.test.ConsStringTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @run testng org.openjdk.nashorn.internal.runtime.test.ConsStringTest
  */
 public class ConsStringTest {
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ContextTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ContextTest.java
similarity index 85%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/ContextTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ContextTest.java
index 35f902e66..e131f754c 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ContextTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ContextTest.java
@@ -23,31 +23,31 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 import java.util.Map;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 import org.testng.annotations.Test;
 
 /**
  * Basic Context API tests.
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- *          jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options
- *          jdk.scripting.nashorn/jdk.nashorn.internal.objects
- * @run testng jdk.nashorn.internal.runtime.test.ContextTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ *          org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.options
+ *          org.openjdk.nashorn/org.openjdk.nashorn.internal.objects
+ * @run testng org.openjdk.nashorn.internal.runtime.test.ContextTest
  */
 @SuppressWarnings("javadoc")
 public class ContextTest {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java
similarity index 87%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java
index cac02e0ee..a29c6fa43 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/ExceptionsNotSerializable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
@@ -33,17 +33,17 @@
 import java.io.ObjectOutputStream;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.internal.runtime.RewriteException;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.internal.runtime.RewriteException;
+import org.openjdk.nashorn.internal.runtime.UnwarrantedOptimismException;
 import org.testng.annotations.Test;
 
 /**
  * JDK-8044518: Ensure exceptions related to optimistic recompilation are not serializable
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @run testng jdk.nashorn.internal.runtime.test.ExceptionsNotSerializable
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @run testng org.openjdk.nashorn.internal.runtime.test.ExceptionsNotSerializable
  */
 @SuppressWarnings("javadoc")
 public class ExceptionsNotSerializable {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8078414_Test.java
similarity index 81%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8078414_Test.java
index 845cc1a59..45ecf6908 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8078414_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8078414_Test.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import java.util.Map;
 import javax.script.Bindings;
-import jdk.nashorn.api.scripting.JSObject;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.objects.NativeArray;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.api.scripting.JSObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.objects.NativeArray;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -47,11 +47,11 @@
  * @test
  * @bug 8078414
  * @summary Test that arbitrary classes can't be converted to mirror's superclasses/interfaces.
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.linker
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.objects
- * @run testng jdk.nashorn.internal.runtime.test.JDK_8078414_Test
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.linker
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime.options
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.objects
+ * @run testng org.openjdk.nashorn.internal.runtime.test.JDK_8078414_Test
  */
 public class JDK_8078414_Test {
     private static Context cx;
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8081015_Test.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8081015_Test.java
index 6051591ea..935be5bfe 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8081015_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8081015_Test.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
@@ -32,8 +32,8 @@
 import java.util.Queue;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.test.models.JDK_8081015_TestModel;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.test.models.JDK_8081015_TestModel;
 import org.testng.annotations.Test;
 
 /**
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8142924_Test.java
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8142924_Test.java
index 68b249359..1d3d0fb3d 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8142924_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8142924_Test.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import jdk.nashorn.internal.objects.NativeSymbol;
-import jdk.nashorn.internal.runtime.Symbol;
+import org.openjdk.nashorn.internal.objects.NativeSymbol;
+import org.openjdk.nashorn.internal.runtime.Symbol;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8186807_Test.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8186807_Test.java
similarity index 83%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8186807_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8186807_Test.java
index 1f0336d47..2a7b5c9f9 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JDK_8186807_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JDK_8186807_Test.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import jdk.nashorn.api.scripting.AbstractJSObject;
-import jdk.nashorn.api.scripting.NashornScriptEngine;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngine;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import static org.testng.Assert.assertEquals;
 import org.testng.annotations.Test;
 import javax.script.ScriptException;
@@ -38,8 +38,8 @@
  * @test
  * @bug 8186807
  * @summary JSObject gets ScriptFunction when ScriptObjectMirror is expected
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @run testng/othervm -Dnashorn.unstable.relink.threshold=1 jdk.nashorn.internal.runtime.test.JDK_8186807_Test
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @run testng/othervm -Dnashorn.unstable.relink.threshold=1 org.openjdk.nashorn.internal.runtime.test.JDK_8186807_Test
  */
 
 public class JDK_8186807_Test {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JSTypeTest.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JSTypeTest.java
index 9d0c0bb8f..36689b877 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/JSTypeTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/JSTypeTest.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.JSType;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
@@ -37,8 +37,8 @@
  * Tests for JSType methods.
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @run testng jdk.nashorn.internal.runtime.test.JSTypeTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @run testng org.openjdk.nashorn.internal.runtime.test.JSTypeTest
  */
 public class JSTypeTest {
     /**
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/LexicalBindingTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/LexicalBindingTest.java
index 9e91195fd..6a2b2c360 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/LexicalBindingTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/LexicalBindingTest.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.annotations.Test;
 
 import javax.script.Bindings;
@@ -40,7 +40,7 @@
  * Top-level lexical binding tests.
  *
  * @test
- * @run testng jdk.nashorn.internal.runtime.test.LexicalBindingTest
+ * @run testng org.openjdk.nashorn.internal.runtime.test.LexicalBindingTest
  */
 @SuppressWarnings("javadoc")
 public class LexicalBindingTest {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java
index d9643e650..de60c8353 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/NoPersistenceCachingTest.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.fail;
 import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
 import javax.script.SimpleScriptContext;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -43,7 +43,7 @@
  * @test
  * @bug 8037378
  * @summary Sanity tests for no persistence caching
- * @run testng/othervm jdk.nashorn.internal.runtime.test.NoPersistenceCachingTest
+ * @run testng/othervm org.openjdk.nashorn.internal.runtime.test.NoPersistenceCachingTest
  */
 @SuppressWarnings("javadoc")
 public class NoPersistenceCachingTest {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/PropertyMapTest.java
similarity index 88%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/PropertyMapTest.java
index d9bdb8378..dbc7083da 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/PropertyMapTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/PropertyMapTest.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import java.util.Iterator;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.internal.runtime.PropertyMap;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -35,8 +35,8 @@
  * Tests for PropertyMap functionality
  *
  * @test
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @run testng jdk.nashorn.internal.runtime.test.PropertyMapTest
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @run testng org.openjdk.nashorn.internal.runtime.test.PropertyMapTest
  */
 @SuppressWarnings("javadoc")
 public class PropertyMapTest {
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/SourceTest.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/SourceTest.java
index 642874cd2..a359935f4 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/SourceTest.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -35,8 +35,8 @@
 import java.io.Reader;
 import java.net.URL;
 import java.util.Arrays;
-import jdk.nashorn.api.scripting.URLReader;
-import jdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.api.scripting.URLReader;
+import org.openjdk.nashorn.internal.runtime.Source;
 import org.testng.annotations.Test;
 
 /**
@@ -50,7 +50,7 @@ public class SourceTest {
     final private static char[] SOURCE_CHARS = SOURCE_STRING.toCharArray();
     final private static String RESOURCE_PATH = "resources/load_test.js";
     final private static File SOURCE_FILE = new File(System.getProperty("build.dir", "build") +
-            "/test/classes/jdk/nashorn/internal/runtime/test/" + RESOURCE_PATH);
+            "/test/classes/org/openjdk/nashorn/internal/runtime/test/" + RESOURCE_PATH);
     final private static URL  SOURCE_URL = SourceTest.class.getResource(RESOURCE_PATH);
 
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java
index 416a204bd..1c551e0d0 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/TrustedScriptEngineTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
@@ -34,9 +34,9 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.script.SimpleScriptContext;
-import jdk.nashorn.api.scripting.ClassFilter;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.internal.runtime.Version;
+import org.openjdk.nashorn.api.scripting.ClassFilter;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.internal.runtime.Version;
 import org.testng.annotations.Test;
 
 /**
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/nashorn/JDK_8187362_Test.java b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/nashorn/JDK_8187362_Test.java
similarity index 84%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/nashorn/JDK_8187362_Test.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/nashorn/JDK_8187362_Test.java
index 118e8e366..ad59957a5 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/nashorn/JDK_8187362_Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/nashorn/JDK_8187362_Test.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.test;
+package org.openjdk.nashorn.internal.runtime.test;
 
-import jdk.nashorn.api.scripting.NashornScriptEngine;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngine;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import javax.script.ScriptException;
 import static org.testng.Assert.assertEquals;
 import org.testng.annotations.Test;
@@ -35,8 +35,8 @@
  * @test
  * @bug 8187362
  * @summary Nashorn unsigned right shift operator unexpectedly returns floating-point
- * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime
- * @run testng jdk.nashorn.internal.runtime.test.JDK_8187362_Test
+ * @modules org.openjdk.nashorn/org.openjdk.nashorn.internal.runtime
+ * @run testng org.openjdk.nashorn.internal.runtime.test.JDK_8187362_Test
  */
 public class JDK_8187362_Test {
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/resources/load_test.js b/test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/resources/load_test.js
similarity index 100%
rename from test/nashorn/src/jdk/nashorn/internal/runtime/test/resources/load_test.js
rename to test/nashorn/src/org/openjdk/nashorn/internal/runtime/test/resources/load_test.js
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
index 1019abdfc..16f20ae25 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_CHECK_COMPILE_MSG;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_COMPARE;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_COMPILE_FAIL;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_RUN_FAIL;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_FORK;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_IGNORE_STD_ERROR;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_RUN;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FAIL_LIST;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_SHARED_CONTEXT;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_CHECK_COMPILE_MSG;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_COMPARE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_COMPILE_FAIL;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_RUN_FAIL;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_FORK;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_IGNORE_STD_ERROR;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_RUN;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FAIL_LIST;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_SHARED_CONTEXT;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
index fe8fa7107..3eb312138 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import org.testng.ITestResult;
 import org.testng.reporters.JUnitReportReporter;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/OrphanTestFinder.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/OrphanTestFinder.java
index 74b5ccd70..34a9368b4 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/OrphanTestFinder.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import java.util.Set;
 import org.testng.Assert;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ParallelTestRunner.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ParallelTestRunner.java
index 336369681..53ecaa496 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ParallelTestRunner.java
@@ -23,14 +23,14 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
-
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_FAILED_LIST_FILE;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ENABLE_STRICT_MODE;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDES_FILE;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_LIST;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FRAMEWORK;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ROOTS;
+package org.openjdk.nashorn.internal.test.framework;
+
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_FAILED_LIST_FILE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ENABLE_STRICT_MODE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDES_FILE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_LIST;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FRAMEWORK;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ROOTS;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -66,7 +66,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jdk.nashorn.internal.test.framework.TestFinder.TestFactory;
+import org.openjdk.nashorn.internal.test.framework.TestFinder.TestFactory;
 
 /**
  * Parallel test runner runs tests in multiple threads - but avoids any dependency
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptEvaluator.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptEvaluator.java
index 6a2eebb7b..b17a5b279 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptEvaluator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptRunnable.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptRunnable.java
index 21a760983..9fafc615a 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptRunnable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -42,7 +42,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.tools.Shell;
+import org.openjdk.nashorn.tools.Shell;
 import org.testng.Assert;
 import org.testng.ITest;
 import org.testng.annotations.Test;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptTest.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptTest.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptTest.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptTest.java
index 70c2992f7..5de435c9c 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/ScriptTest.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/ScriptTest.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_INCLUDES;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_INCLUDES;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import jdk.nashorn.internal.test.framework.TestFinder.TestFactory;
+import org.openjdk.nashorn.internal.test.framework.TestFinder.TestFactory;
 import org.testng.ITest;
 import org.testng.annotations.Factory;
 import org.testng.annotations.Listeners;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
index d108a1b0b..a0f2e5bbb 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import jdk.nashorn.tools.Shell;
+import org.openjdk.nashorn.tools.Shell;
 
 /**
  * A script evaluator that uses a fresh Nashorn Context to evaluate scripts.
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/SharedContextEvaluator.java
similarity index 87%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/SharedContextEvaluator.java
index b7844b927..d5c10af70 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
-import static jdk.nashorn.internal.runtime.Source.sourceFor;
-import static jdk.nashorn.tools.Shell.COMPILATION_ERROR;
-import static jdk.nashorn.tools.Shell.RUNTIME_ERROR;
-import static jdk.nashorn.tools.Shell.SUCCESS;
+import static org.openjdk.nashorn.internal.runtime.Source.sourceFor;
+import static org.openjdk.nashorn.tools.Shell.COMPILATION_ERROR;
+import static org.openjdk.nashorn.tools.Shell.RUNTIME_ERROR;
+import static org.openjdk.nashorn.tools.Shell.SUCCESS;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.objects.Global;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ErrorManager;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.options.Options;
+import org.openjdk.nashorn.api.scripting.NashornException;
+import org.openjdk.nashorn.internal.objects.Global;
+import org.openjdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.internal.runtime.ErrorManager;
+import org.openjdk.nashorn.internal.runtime.ScriptFunction;
+import org.openjdk.nashorn.internal.runtime.ScriptRuntime;
+import org.openjdk.nashorn.internal.runtime.options.Options;
 
 /**
  * A script evaluator that shares a single Nashorn Context instance to run
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestConfig.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestConfig.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/TestConfig.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestConfig.java
index e539ee2a2..adf58340c 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestConfig.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestConfig.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 /**
  * Configuration info for script tests.
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestFinder.java
similarity index 91%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestFinder.java
index 7332e3271..583e0460d 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestFinder.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.internal.test.framework;
-
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_CHECK_COMPILE_MSG;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_COMPARE;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_COMPILE_FAIL;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_RUN_FAIL;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_FORK;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_IGNORE_STD_ERROR;
-import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_RUN;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_FAILED_LIST_FILE;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ENABLE_STRICT_MODE;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDES_FILE;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_DIR;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_LIST;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FRAMEWORK;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_INCLUDES;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_LIST;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ROOTS;
-import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_UNCHECKED_DIR;
+package org.openjdk.nashorn.internal.test.framework;
+
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_CHECK_COMPILE_MSG;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_COMPARE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_COMPILE_FAIL;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_RUN_FAIL;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_FORK;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_IGNORE_STD_ERROR;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.OPTIONS_RUN;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_FAILED_LIST_FILE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ENABLE_STRICT_MODE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDES_FILE;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_DIR;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_LIST;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FRAMEWORK;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_INCLUDES;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_LIST;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ROOTS;
+import static org.openjdk.nashorn.internal.test.framework.TestConfig.TEST_JS_UNCHECKED_DIR;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -68,7 +68,7 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import jdk.nashorn.tools.Shell;
+import org.openjdk.nashorn.tools.Shell;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestHelper.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestHelper.java
index 733b3e3d9..ed3aec886 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestHelper.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestReorderInterceptor.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestReorderInterceptor.java
index 6a134ddf0..7e4727e19 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/framework/TestReorderInterceptor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.framework;
+package org.openjdk.nashorn.internal.test.framework;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/models/InternalRunnable.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/models/InternalRunnable.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/internal/test/models/InternalRunnable.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/models/InternalRunnable.java
index 503d8f6ef..1a27260e5 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/models/InternalRunnable.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/models/InternalRunnable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.models;
+package org.openjdk.nashorn.internal.test.models;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -69,4 +69,3 @@ public void getInvisibleProperty() {
         throw new AssertionError();
     }
 }
-
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java b/test/nashorn/src/org/openjdk/nashorn/internal/test/models/RestrictedRunnable.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java
rename to test/nashorn/src/org/openjdk/nashorn/internal/test/models/RestrictedRunnable.java
index aa5bfb779..97f2fc53e 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java
+++ b/test/nashorn/src/org/openjdk/nashorn/internal/test/models/RestrictedRunnable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.test.models;
+package org.openjdk.nashorn.internal.test.models;
 
 /**
  * Acts as a restricted interface implemented by a restricted class.
diff --git a/test/nashorn/src/jdk/nashorn/test/models/A.java b/test/nashorn/src/org/openjdk/nashorn/test/models/A.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/A.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/A.java
index 3b302a683..fbb8e2a1b 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/A.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/A.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 public interface A {
     default String a() {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/ArrayConversionPreferences.java b/test/nashorn/src/org/openjdk/nashorn/test/models/ArrayConversionPreferences.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/test/models/ArrayConversionPreferences.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/ArrayConversionPreferences.java
index a88f3c37b..6af4e72ce 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/ArrayConversionPreferences.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/ArrayConversionPreferences.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.util.Collection;
 import java.util.Deque;
@@ -71,4 +71,3 @@ public class ArrayConversionPreferences {
     public boolean testArrayOverMap(final Object[] x) { return true; }
     public boolean testArrayOverMap(final Map x) { return false; }
 }
-
diff --git a/test/nashorn/src/jdk/nashorn/test/models/B.java b/test/nashorn/src/org/openjdk/nashorn/test/models/B.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/B.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/B.java
index 8c98c193c..6ba6da05e 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/B.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/B.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 public interface B extends A {
     default String b() {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/BigAbstract.java b/test/nashorn/src/org/openjdk/nashorn/test/models/BigAbstract.java
similarity index 99%
rename from test/nashorn/src/jdk/nashorn/test/models/BigAbstract.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/BigAbstract.java
index cc200c733..9887ec9f3 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/BigAbstract.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/BigAbstract.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 public abstract class BigAbstract {
     public static void accept(final BigAbstract ba) {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/ClassLoaderAware.java b/test/nashorn/src/org/openjdk/nashorn/test/models/ClassLoaderAware.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/ClassLoaderAware.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/ClassLoaderAware.java
index 491e9db2b..5312a9f4a 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/ClassLoaderAware.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/ClassLoaderAware.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public interface ClassLoaderAware {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java b/test/nashorn/src/org/openjdk/nashorn/test/models/ClassWithFinalFinalizer.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/ClassWithFinalFinalizer.java
index a1909a03f..cd2a414a6 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/ClassWithFinalFinalizer.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/ClassWithFinalFinalizer.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class ClassWithFinalFinalizer {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java b/test/nashorn/src/org/openjdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java
index 6a1f4d651..39ff7a3f0 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/ClassWithInheritedFinalFinalizer.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class ClassWithInheritedFinalFinalizer extends ClassWithFinalFinalizer {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/ConstructorWithArgument.java b/test/nashorn/src/org/openjdk/nashorn/test/models/ConstructorWithArgument.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/ConstructorWithArgument.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/ConstructorWithArgument.java
index 1483a6e52..5d225fd6d 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/ConstructorWithArgument.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/ConstructorWithArgument.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public abstract class ConstructorWithArgument {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/DessertTopping.java b/test/nashorn/src/org/openjdk/nashorn/test/models/DessertTopping.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/DessertTopping.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/DessertTopping.java
index a4352499f..07c1ff695 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/DessertTopping.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/DessertTopping.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public interface DessertTopping {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java b/test/nashorn/src/org/openjdk/nashorn/test/models/DessertToppingFloorWaxDriver.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/DessertToppingFloorWaxDriver.java
index f074ec3d6..f7258fcad 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/DessertToppingFloorWaxDriver.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/DessertToppingFloorWaxDriver.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class DessertToppingFloorWaxDriver {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/FinalClass.java b/test/nashorn/src/org/openjdk/nashorn/test/models/FinalClass.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/FinalClass.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/FinalClass.java
index 3b759dd2c..5a287c054 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/FinalClass.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/FinalClass.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public final class FinalClass {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/FloorWax.java b/test/nashorn/src/org/openjdk/nashorn/test/models/FloorWax.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/FloorWax.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/FloorWax.java
index 024392720..54d84f6ba 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/FloorWax.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/FloorWax.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public interface FloorWax {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java b/test/nashorn/src/org/openjdk/nashorn/test/models/FunctionalInterfaceProvider.java
similarity index 94%
rename from test/nashorn/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/FunctionalInterfaceProvider.java
index 408c05135..0e0e2611e 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/FunctionalInterfaceProvider.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/FunctionalInterfaceProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.testng.Assert;
 
 import java.util.List;
diff --git a/test/nashorn/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java b/test/nashorn/src/org/openjdk/nashorn/test/models/IntFloatOverloadSelection.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/IntFloatOverloadSelection.java
index 52a745527..cf5185384 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/IntFloatOverloadSelection.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class IntFloatOverloadSelection {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java b/test/nashorn/src/org/openjdk/nashorn/test/models/InternalRunnableSuperclass.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/InternalRunnableSuperclass.java
index ba3a49bd3..6e1021a8c 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/InternalRunnableSuperclass.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import jdk.dynalink.beans.StaticClass;
-import jdk.nashorn.internal.test.models.InternalRunnable;
+import org.openjdk.nashorn.internal.test.models.InternalRunnable;
 
 /**
  * Acts as a non-restricted superclass for a restricted class.
diff --git a/test/nashorn/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java b/test/nashorn/src/org/openjdk/nashorn/test/models/JDK_8081015_TestModel.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/JDK_8081015_TestModel.java
index e283e59cf..9bfe20448 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/JDK_8081015_TestModel.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/JDK_8081015_TestModel.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
diff --git a/test/nashorn/src/jdk/nashorn/test/models/JDK_8184241Test.java b/test/nashorn/src/org/openjdk/nashorn/test/models/JDK_8184241Test.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/JDK_8184241Test.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/JDK_8184241Test.java
index a1c2438e1..0351d8361 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/JDK_8184241Test.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/JDK_8184241Test.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 public class JDK_8184241Test {
     public JDK_8184241Test() {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java b/test/nashorn/src/org/openjdk/nashorn/test/models/Jdk8011362TestSubject.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/Jdk8011362TestSubject.java
index d7f2a95fe..8f86a8011 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/Jdk8011362TestSubject.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/Jdk8011362TestSubject.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 /**
  * Test class used by JDK-8011362.js
diff --git a/test/nashorn/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java b/test/nashorn/src/org/openjdk/nashorn/test/models/Jdk8072596TestSubject.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/Jdk8072596TestSubject.java
index 900fe7832..9a14d7f20 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/Jdk8072596TestSubject.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/Jdk8072596TestSubject.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-import jdk.nashorn.internal.runtime.ScriptObject;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.internal.runtime.ScriptObject;
 import org.testng.Assert;
 
 public class Jdk8072596TestSubject {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/LongProvider.java b/test/nashorn/src/org/openjdk/nashorn/test/models/LongProvider.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/test/models/LongProvider.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/LongProvider.java
index d205b8cd0..2a7a2f04d 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/LongProvider.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/LongProvider.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.util.Arrays;
 
diff --git a/test/nashorn/src/jdk/nashorn/test/models/Nashorn401TestSubject.java b/test/nashorn/src/org/openjdk/nashorn/test/models/Nashorn401TestSubject.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/Nashorn401TestSubject.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/Nashorn401TestSubject.java
index 8d5294423..719c9070a 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/Nashorn401TestSubject.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/Nashorn401TestSubject.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class Nashorn401TestSubject {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java b/test/nashorn/src/org/openjdk/nashorn/test/models/NoAccessibleConstructorClass.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/NoAccessibleConstructorClass.java
index 68ca4f888..5050216cb 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/NoAccessibleConstructorClass.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/NoAccessibleConstructorClass.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class NoAccessibleConstructorClass {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/NonPublicClass.java b/test/nashorn/src/org/openjdk/nashorn/test/models/NonPublicClass.java
similarity index 96%
rename from test/nashorn/src/jdk/nashorn/test/models/NonPublicClass.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/NonPublicClass.java
index d0a61856c..f75cdd533 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/NonPublicClass.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/NonPublicClass.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 class NonPublicClass {
     public NonPublicClass() { }
diff --git a/test/nashorn/src/jdk/nashorn/test/models/NullProvider.java b/test/nashorn/src/org/openjdk/nashorn/test/models/NullProvider.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/NullProvider.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/NullProvider.java
index e21bf7aed..b2b6eff3e 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/NullProvider.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/NullProvider.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class NullProvider {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/OuterClass.java b/test/nashorn/src/org/openjdk/nashorn/test/models/OuterClass.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/test/models/OuterClass.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/OuterClass.java
index 3d6f279a8..77c40fae8 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/OuterClass.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/OuterClass.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class OuterClass {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/OverloadedSam.java b/test/nashorn/src/org/openjdk/nashorn/test/models/OverloadedSam.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/OverloadedSam.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/OverloadedSam.java
index b75f6b079..c567a8b4a 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/OverloadedSam.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/OverloadedSam.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public interface OverloadedSam {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/OverloadedSetter.java b/test/nashorn/src/org/openjdk/nashorn/test/models/OverloadedSetter.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/OverloadedSetter.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/OverloadedSetter.java
index 810ae2f12..b7ff7564d 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/OverloadedSetter.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/OverloadedSetter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 public class OverloadedSetter {
     private String color;
diff --git a/test/nashorn/src/jdk/nashorn/test/models/OverrideObject.java b/test/nashorn/src/org/openjdk/nashorn/test/models/OverrideObject.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/OverrideObject.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/OverrideObject.java
index ed5a895ef..e6d6f5483 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/OverrideObject.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/OverrideObject.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class OverrideObject {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/PropertyBind.java b/test/nashorn/src/org/openjdk/nashorn/test/models/PropertyBind.java
similarity index 98%
rename from test/nashorn/src/jdk/nashorn/test/models/PropertyBind.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/PropertyBind.java
index 09e853094..93d14330d 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/PropertyBind.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/PropertyBind.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public class PropertyBind {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/Reflector.java b/test/nashorn/src/org/openjdk/nashorn/test/models/Reflector.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/test/models/Reflector.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/Reflector.java
index 72f2938d0..5ca8eee03 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/Reflector.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/Reflector.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import jdk.nashorn.internal.runtime.Context;
+import org.openjdk.nashorn.api.scripting.AbstractJSObject;
 
 /**
  * Few tests reflectively invoke or read fields of Nashorn classes
@@ -40,7 +40,7 @@
  */
 public final class Reflector {
     private Reflector() {}
-    private static final Module NASHORN_MOD = Context.class.getModule();
+    private static final Module NASHORN_MOD = AbstractJSObject.class.getModule();
 
     public static void setAccessible(Executable e) {
         if (e.getDeclaringClass().getModule() != NASHORN_MOD) {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/SourceHelper.java b/test/nashorn/src/org/openjdk/nashorn/test/models/SourceHelper.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/test/models/SourceHelper.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/SourceHelper.java
index d05258272..f853d483b 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/SourceHelper.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/SourceHelper.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
 import java.net.URL;
-import jdk.nashorn.internal.runtime.Source;
+import org.openjdk.nashorn.internal.runtime.Source;
 
 /**
  * Helper class to facilitate script access of nashorn Source class.
diff --git a/test/nashorn/src/jdk/nashorn/test/models/StringArgs.java b/test/nashorn/src/org/openjdk/nashorn/test/models/StringArgs.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/StringArgs.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/StringArgs.java
index d80480f5e..6b1c6755d 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/StringArgs.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/StringArgs.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.util.List;
 
diff --git a/test/nashorn/src/jdk/nashorn/test/models/Toothpaste.java b/test/nashorn/src/org/openjdk/nashorn/test/models/Toothpaste.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/Toothpaste.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/Toothpaste.java
index 747de89cc..14fcb4d45 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/Toothpaste.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/Toothpaste.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 @SuppressWarnings("javadoc")
 public abstract class Toothpaste {
diff --git a/test/nashorn/src/jdk/nashorn/test/models/VarArgConstructor.java b/test/nashorn/src/org/openjdk/nashorn/test/models/VarArgConstructor.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/VarArgConstructor.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/VarArgConstructor.java
index 6c31627fa..9d2279c24 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/VarArgConstructor.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/VarArgConstructor.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 import java.util.List;
 
diff --git a/test/nashorn/src/jdk/nashorn/test/models/VarArgConsumer.java b/test/nashorn/src/org/openjdk/nashorn/test/models/VarArgConsumer.java
similarity index 97%
rename from test/nashorn/src/jdk/nashorn/test/models/VarArgConsumer.java
rename to test/nashorn/src/org/openjdk/nashorn/test/models/VarArgConsumer.java
index a9b540129..f5462ea72 100644
--- a/test/nashorn/src/jdk/nashorn/test/models/VarArgConsumer.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/models/VarArgConsumer.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
 /**
  * Simple function interface with a varargs SAM method.
@@ -32,4 +32,3 @@
 public interface VarArgConsumer {
     public void apply(Object... o);
 }
-
diff --git a/test/nashorn/src/jdk/nashorn/test/nashorn/models/ES6ASTVisitor.java b/test/nashorn/src/org/openjdk/nashorn/test/nashorn/models/ES6ASTVisitor.java
similarity index 93%
rename from test/nashorn/src/jdk/nashorn/test/nashorn/models/ES6ASTVisitor.java
rename to test/nashorn/src/org/openjdk/nashorn/test/nashorn/models/ES6ASTVisitor.java
index 89a999164..f61be99a4 100644
--- a/test/nashorn/src/jdk/nashorn/test/nashorn/models/ES6ASTVisitor.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/nashorn/models/ES6ASTVisitor.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.nashorn.test.models;
+package org.openjdk.nashorn.test.models;
 
-import jdk.nashorn.api.tree.SimpleTreeVisitorES6;
-import jdk.nashorn.api.tree.*;
+import org.openjdk.nashorn.api.tree.SimpleTreeVisitorES6;
+import org.openjdk.nashorn.api.tree.*;
 
 public class ES6ASTVisitor{
 
@@ -48,4 +48,3 @@ public Boolean visitCompilationUnit(CompilationUnitTree stmt, Void none) {
         }
 
 }
-
diff --git a/test/nashorn/src/jdk/nashorn/test/tools/StaticTypeInspector.java b/test/nashorn/src/org/openjdk/nashorn/test/tools/StaticTypeInspector.java
similarity index 95%
rename from test/nashorn/src/jdk/nashorn/test/tools/StaticTypeInspector.java
rename to test/nashorn/src/org/openjdk/nashorn/test/tools/StaticTypeInspector.java
index 8a971f3d9..ce4c139e4 100644
--- a/test/nashorn/src/jdk/nashorn/test/tools/StaticTypeInspector.java
+++ b/test/nashorn/src/org/openjdk/nashorn/test/tools/StaticTypeInspector.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.nashorn.test.tools;
+package org.openjdk.nashorn.test.tools;
 
-import jdk.nashorn.internal.runtime.Undefined;
+import org.openjdk.nashorn.internal.runtime.Undefined;
 
 @SuppressWarnings("javadoc")
 public class StaticTypeInspector {