diff --git a/nashorn/make/BuildNashorn.gmk b/nashorn/make/BuildNashorn.gmk index a987874c7ea..e7838e00d13 100644 --- a/nashorn/make/BuildNashorn.gmk +++ b/nashorn/make/BuildNashorn.gmk @@ -30,7 +30,8 @@ default: all include MakeBase.gmk include JavaCompilation.gmk -JDK_CLASSES := $(JDK_OUTPUTDIR)/classes +JDK_CLASSES := $(subst $(SPACE),$(PATH_SEP),$(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \ + java.base java.logging java.scripting))) NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar NASHORN_VERSION := $(JDK_VERSION) @@ -46,19 +47,19 @@ endif $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ JVM := $(JAVA), \ JAVAC := $(NEW_JAVAC), \ - FLAGS := -g -source 7 -target 7 -bootclasspath $(JDK_CLASSES), \ + FLAGS := -g -source 7 -target 7 -bootclasspath "$(JDK_CLASSES)", \ SERVER_DIR := $(SJAVAC_SERVER_DIR), \ SERVER_JVM := $(SJAVAC_SERVER_JAVA))) # Build nashorn into intermediate directory $(eval $(call SetupJavaCompilation,BUILD_NASHORN, \ SETUP := GENERATE_NEWBYTECODE_DEBUG, \ - SRC := $(NASHORN_TOPDIR)/src, \ + SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \ COPY := .properties .js, \ BIN := $(NASHORN_OUTPUTDIR)/nashorn_classes)) NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src -ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm +ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm # Build nasgen $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \ @@ -70,8 +71,11 @@ $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \ # Nasgen needs nashorn classes $(BUILD_NASGEN): $(BUILD_NASHORN) +NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn +NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run + # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package -$(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN) +$(NASGEN_RUN_FILE): $(BUILD_NASGEN) $(ECHO) Running nasgen $(MKDIR) -p $(@D) $(RM) -rf $(@D)/jdk $(@D)/netscape @@ -82,11 +86,12 @@ $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN) $(TOUCH) $@ # Version file needs to be processed with version numbers -VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties +VERSION_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties +VERSION_SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template # Needs to happen after nasgen run since nasgen run deletes it -$(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run -$(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template +$(VERSION_FILE): $(NASGEN_RUN_FILE) +$(VERSION_FILE): $(VERSION_SRC) $(ECHO) Creating version.properties $(MKDIR) -p $(@D) $(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \ @@ -98,15 +103,16 @@ MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\ # Create nashorn.jar from the final classes dir $(eval $(call SetupArchive,BUILD_NASHORN_JAR, \ - $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \ + $(NASGEN_RUN_FILE) \ $(VERSION_FILE), \ - SRCS := $(NASHORN_OUTPUTDIR)/classes, \ + SRCS := $(NASHORN_CLASSES_DIR), \ SUFFIXES := .class .js .properties Factory, \ - MANIFEST := $(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF, \ + MANIFEST := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF, \ EXTRA_MANIFEST_ATTR := $(MANIFEST_ATTRIBUTES), \ SKIP_METAINF := true, \ JAR := $(NASHORN_JAR))) +compile: $(NASHORN_RUN_FILE) $(VERSION_FILE) all: $(NASHORN_JAR) -.PHONY: all +.PHONY: compile all diff --git a/nashorn/src/META-INF/MANIFEST.MF b/nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF similarity index 100% rename from nashorn/src/META-INF/MANIFEST.MF rename to nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF diff --git a/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory b/nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/services/javax.script.ScriptEngineFactory similarity index 100% rename from nashorn/src/META-INF/services/javax.script.ScriptEngineFactory rename to nashorn/src/jdk.scripting.nashorn/share/classes/META-INF/services/javax.script.ScriptEngineFactory diff --git a/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/CallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/CallSiteDescriptor.java diff --git a/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/ChainedCallSite.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/ChainedCallSite.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/ChainedCallSite.java diff --git a/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DefaultBootstrapper.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DefaultBootstrapper.java diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/DynamicLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinkerFactory.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinkerFactory.java diff --git a/nashorn/src/jdk/internal/dynalink/GuardedInvocationFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/GuardedInvocationFilter.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/GuardedInvocationFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/GuardedInvocationFilter.java diff --git a/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/MonomorphicCallSite.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/MonomorphicCallSite.java diff --git a/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/NoSuchDynamicMethodException.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/NoSuchDynamicMethodException.java diff --git a/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/RelinkableCallSite.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/RelinkableCallSite.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AbstractJavaLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AbstractJavaLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AccessibleMembersLookup.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/AccessibleMembersLookup.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanIntrospector.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanIntrospector.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeanLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeansLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/BeansLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDetector.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDetector.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CheckRestrictedPackage.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/CheckRestrictedPackage.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassString.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/ClassString.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/ClassString.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethod.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethod.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethodLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/DynamicMethodLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/FacetIntrospector.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/FacetIntrospector.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/GuardedInvocationComponent.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/GuardedInvocationComponent.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/MaximallySpecific.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/MaximallySpecific.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedMethod.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/OverloadedMethod.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SimpleDynamicMethod.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SimpleDynamicMethod.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SingleDynamicMethod.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/SingleDynamicMethod.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClass.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/StaticClass.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClass.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassIntrospector.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassIntrospector.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/StaticClassLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/messages.properties similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/messages.properties rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/messages.properties diff --git a/nashorn/src/jdk/internal/dynalink/beans/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/package.html similarity index 100% rename from nashorn/src/jdk/internal/dynalink/beans/package.html rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/beans/package.html diff --git a/nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/ConversionComparator.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/ConversionComparator.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedInvocation.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedInvocation.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardedTypeConversion.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedTypeConversion.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/GuardedTypeConversion.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardedTypeConversion.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingDynamicLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkRequest.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkRequest.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkerServices.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/LinkerServices.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/linker/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/package.html similarity index 100% rename from nashorn/src/jdk/internal/dynalink/linker/package.html rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/linker/package.html diff --git a/nashorn/src/jdk/internal/dynalink/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/package.html similarity index 100% rename from nashorn/src/jdk/internal/dynalink/package.html rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/package.html diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java diff --git a/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AutoDiscovery.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/AutoDiscovery.java diff --git a/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java diff --git a/nashorn/src/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java diff --git a/nashorn/src/jdk/internal/dynalink/support/ClassMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassMap.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/ClassMap.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/ClassMap.java diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java diff --git a/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java diff --git a/nashorn/src/jdk/internal/dynalink/support/DefaultPrelinkFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultPrelinkFilter.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/DefaultPrelinkFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/DefaultPrelinkFilter.java diff --git a/nashorn/src/jdk/internal/dynalink/support/Guards.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Guards.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/Guards.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Guards.java diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkRequestImpl.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkRequestImpl.java diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkerServicesImpl.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LinkerServicesImpl.java diff --git a/nashorn/src/jdk/internal/dynalink/support/Lookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Lookup.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/Lookup.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/Lookup.java diff --git a/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java diff --git a/nashorn/src/jdk/internal/dynalink/support/NameCodec.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NameCodec.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/NameCodec.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NameCodec.java diff --git a/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java diff --git a/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeConverterFactory.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeConverterFactory.java diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeUtilities.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/TypeUtilities.java diff --git a/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java diff --git a/nashorn/src/jdk/internal/dynalink/support/messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/messages.properties similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/messages.properties rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/messages.properties diff --git a/nashorn/src/jdk/internal/dynalink/support/package.html b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/package.html similarity index 100% rename from nashorn/src/jdk/internal/dynalink/support/package.html rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/package.html diff --git a/nashorn/src/jdk/nashorn/api/scripting/AbstractJSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/AbstractJSObject.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/Formatter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/Formatter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/Formatter.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/JSObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/JSObject.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/NashornException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/URLReader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/URLReader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/package-info.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/Messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties similarity index 100% rename from nashorn/src/jdk/nashorn/api/scripting/resources/Messages.properties rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/resources/Messages.properties diff --git a/nashorn/src/jdk/nashorn/internal/IntDeque.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/IntDeque.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/IntDeque.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ApplySpecialization.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/ApplySpecialization.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ApplySpecialization.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/AssignSymbols.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/AssignSymbols.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/BranchOptimizer.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationException.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Compiler.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilerConstants.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Condition.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Condition.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Condition.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/DumpBytecode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/DumpBytecode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/DumpBytecode.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Emitter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Emitter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Emitter.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FieldObjectCreator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FindScopeDepths.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/FindScopeDepths.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FindScopeDepths.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FoldConstants.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/FunctionSignature.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Label.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Label.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Label.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalStateRestorationInfo.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Lower.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapCreator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MapTuple.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/MapTuple.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MapTuple.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Namespace.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Namespace.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectClassGenerator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ObjectCreator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ProgramPoints.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/ProgramPoints.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ProgramPoints.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/RuntimeCallSite.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/RuntimeCallSite.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SharedScopeCall.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SpillObjectCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/SpillObjectCreator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SpillObjectCreator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitMethodEmitter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitMethodEmitter.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/Splitter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/TypeEvaluator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/TypeEvaluator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeEvaluator.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/TypeMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/TypeMap.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/TypeMap.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/WeighNodes.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ArrayType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BitwiseType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BytecodeOps.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/LongType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumberType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/NumericType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/ObjectType.java diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/codegen/types/Type.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/Type.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/AccessNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/AccessNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Assignment.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Assignment.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BaseNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BaseNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BinaryNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Block.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Block.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockLexicalContext.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BlockStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BlockStatement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BlockStatement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BreakNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/BreakableStatement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/BreakableStatement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/CallNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CallNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/CaseNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CaseNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/CatchNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/CatchNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ContinueNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/EmptyNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Expression.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Expression.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Expression.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/ExpressionStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/ExpressionStatement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ExpressionStatement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Flags.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Flags.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Flags.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/ForNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/ForNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ForNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionCall.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/FunctionNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/IdentNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IdentNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/IfNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/IfNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IfNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/IndexNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/IndexNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/JoinPredecessor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/JoinPredecessor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessor.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/JoinPredecessorExpression.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/JoinPredecessorExpression.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JoinPredecessorExpression.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/JumpStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/JumpStatement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/JumpStatement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LabelNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LabelNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Labels.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Labels.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Labels.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextExpression.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContextExpression.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextExpression.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContextStatement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LexicalContextStatement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContextStatement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LocalVariableConversion.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LocalVariableConversion.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LocalVariableConversion.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/LoopNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/LoopNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LoopNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Node.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Node.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Optimistic.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Optimistic.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Optimistic.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/OptimisticLexicalContext.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/OptimisticLexicalContext.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/OptimisticLexicalContext.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyKey.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/PropertyNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ReturnNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/SplitNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Statement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Statement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Statement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SwitchNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Symbol.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Symbol.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/Terminal.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/Terminal.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/Terminal.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TernaryNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ThrowNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/TryNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/UnaryNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/VarNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/VarNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/WhileNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WhileNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/WithNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/WithNode.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Ignore.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Immutable.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/annotations/Immutable.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Immutable.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/annotations/Reference.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ASTWriter.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/JSONWriter.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/NashornClassReader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/NashornClassReader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornClassReader.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/NashornTextifier.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/NashornTextifier.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/PrintVisitor.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/visitor/NodeVisitor.java diff --git a/nashorn/src/jdk/nashorn/internal/lookup/Lookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/lookup/Lookup.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/Lookup.java diff --git a/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFactory.java diff --git a/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ArrayBufferView.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/DataPropertyDescriptor.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/Global.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArguments.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeArray.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeBoolean.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDataView.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeDataView.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeDate.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDate.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeEvalError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSAdapter.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJSON.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeJava.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJava.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeMath.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeNumber.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeObject.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeObject.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRangeError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeReferenceError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExpExecResult.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeStrictArguments.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeString.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeString.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeSyntaxError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeTypeError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeURIError.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/PrototypeObject.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/PrototypeObject.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Attribute.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Optimistic.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Optimistic.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Optimistic.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Property.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Where.java diff --git a/nashorn/src/jdk/nashorn/internal/objects/package-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/objects/package-info.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/package-info.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/DateParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/DateParser.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/JSONParser.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/Lexer.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/Parser.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/Scanner.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Scanner.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/Token.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/Token.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Token.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/TokenKind.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenKind.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenLookup.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/TokenStream.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenStream.java diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/parser/TokenType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ArgumentSetter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/BitVector.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/BitVector.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeInstaller.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeStore.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/CodeStore.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CodeStore.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CompiledFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/CompiledFunction.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunction.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CompiledFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/CompiledFunctions.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledFunctions.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CompiledScript.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/CompiledScript.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/CompiledScript.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ConsString.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ConsString.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Context.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Debug.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Debug.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAErrors.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ECMAException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ErrorManager.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FindProperty.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/GlobalConstants.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalConstants.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/GlobalFunctions.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSErrorType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSObjectListAdapter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/JSType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ListAdapter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NumberToString.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NumberToString.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/OptimisticReturnFilters.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ParserException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ParserException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Property.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Property.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyAccess.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyDescriptor.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyHashMap.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListeners.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyListeners.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyListeners.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RewriteException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/RewriteException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RewriteException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Scope.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunction.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptFunctionData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SetMethodCreator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Source.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/SpillProperty.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Timing.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Timing.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Timing.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/URIUtils.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Undefined.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UnwarrantedOptimismException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Version.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/Version.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/WithObject.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ByteBufferArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ContinuousArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IntArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/IteratorAction.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LongArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/LongArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/TypedArrayData.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/events/RecompilationEvent.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/events/RecompilationEvent.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RecompilationEvent.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/events/RuntimeEvent.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/events/RuntimeEvent.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/events/RuntimeEvent.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationResult.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationResult.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/Bootstrap.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/InvokeByName.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornGuards.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/logging/DebugLogger.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/logging/DebugLogger.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/DebugLogger.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/logging/Loggable.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/logging/Loggable.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Loggable.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/logging/Logger.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/logging/Logger.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/logging/Logger.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/KeyValueOption.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/LoggingOption.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/options/LoggingOption.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/LoggingOption.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/options/Option.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Option.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/OptionTemplate.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/options/Options.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExp.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpResult.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Config.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Option.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Parser.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Regex.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Region.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Token.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Options.properties diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/base.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/base.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/bootstrap.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/controls.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/controls.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/controls.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/fxml.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/fxml.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/fxml.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/graphics.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/graphics.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/graphics.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/media.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/media.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/media.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swing.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swing.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swing.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swt.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swt.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/swt.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/swt.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/fx/web.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/fx/web.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/web.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template similarity index 100% rename from nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JO.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/scripts/JO.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JO.java diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JS.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java similarity index 100% rename from nashorn/src/jdk/nashorn/internal/scripts/JS.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/JS.java diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java similarity index 100% rename from nashorn/src/jdk/nashorn/tools/Shell.java rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java diff --git a/nashorn/src/jdk/nashorn/tools/resources/Shell.properties b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties similarity index 100% rename from nashorn/src/jdk/nashorn/tools/resources/Shell.properties rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/Shell.properties diff --git a/nashorn/src/jdk/nashorn/tools/resources/shell.js b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js similarity index 100% rename from nashorn/src/jdk/nashorn/tools/resources/shell.js rename to nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js diff --git a/nashorn/src/overview.html b/nashorn/src/jdk.scripting.nashorn/share/classes/overview.html similarity index 100% rename from nashorn/src/overview.html rename to nashorn/src/jdk.scripting.nashorn/share/classes/overview.html