diff --git a/jdk/make/gensrc/GensrcX11Wrappers.gmk b/jdk/make/gensrc/GensrcX11Wrappers.gmk index dd754cd7ac1..b21729654f8 100644 --- a/jdk/make/gensrc/GensrcX11Wrappers.gmk +++ b/jdk/make/gensrc/GensrcX11Wrappers.gmk @@ -96,9 +96,9 @@ ifneq ($(COMPILE_TYPE), cross) -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ # # Compile the C code into an executable. diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index 46d7f2a73d1..0d38b332892 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -28,7 +28,7 @@ WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib ################################################################################ BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib + $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image @@ -79,8 +79,8 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib \ - $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \ # LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \ $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \ @@ -145,8 +145,8 @@ endif LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ # ifeq ($(OPENJDK_TARGET_OS), aix) @@ -154,9 +154,9 @@ ifeq ($(OPENJDK_TARGET_OS), aix) endif ifeq ($(OPENJDK_TARGET_OS), windows) - LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility + LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility else - LIBAWT_EXFILES := sun/java2d/ShaderList.c + LIBAWT_EXFILES := java2d/ShaderList.c endif ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) @@ -164,7 +164,7 @@ ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) endif ifeq ($(OPENJDK_TARGET_OS), macosx) - LIBAWT_EXFILES += initIDs.c sun/awt/image/cvutils/img_colors.c + LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c endif LIBAWT_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ @@ -183,8 +183,8 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) LIBAWT_CFLAGS += -xarch=sparcvis LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il - LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib - LIBAWT_EXFILES += sun/java2d/loops/MapAccelFunc.c + LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib + LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c ifeq ($(OPENJDK_TARGET_CPU), sparcv9) LIBAWT_ASFLAGS = -P -xarch=v9a @@ -193,9 +193,9 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) endif else LIBAWT_EXCLUDES += \ - $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/awt/medialib \ - $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d/loops \ - $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \ # endif @@ -206,19 +206,19 @@ endif LIBAWT_LANG := C ifeq ($(OPENJDK_TARGET_OS), windows) - LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ # Why does libawt need java.base headers? - LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \ + LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \ -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \ # LIBAWT_EXFILES += \ - sun/java2d/d3d/D3DShaderGen.c \ - sun/awt/image/cvutils/img_colors.c \ + java2d/d3d/D3DShaderGen.c \ + awt/image/cvutils/img_colors.c \ # LIBAWT_LANG := C++ @@ -232,7 +232,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) else LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons" endif - LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/sun/windows/awt.rc + LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc endif ifeq ($(MILESTONE), internal) @@ -300,13 +300,13 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) LIBAWT_XAWT_DIRS := \ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ # LIBAWT_XAWT_EXCLUDES := medialib @@ -316,14 +316,14 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \ $(LIBJAVA_HEADER_FLAGS) # @@ -388,8 +388,8 @@ endif LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ $(LIBJAVA_HEADER_FLAGS) \ # @@ -542,7 +542,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ X11TextRenderer.c LIBFONTMANAGER_OPTIMIZATION := HIGHEST - LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows + LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows else ifeq ($(OPENJDK_TARGET_OS), macosx) LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ X11TextRenderer.c \ @@ -607,11 +607,11 @@ DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER) ifeq ($(OPENJDK_TARGET_OS), windows) LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt - LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d/windows \ + LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d/windows \ -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ @@ -658,7 +658,7 @@ else # OPENJDK_TARGET_OS not windows LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt endif LIBJAWT_CFLAGS := \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ @@ -723,26 +723,26 @@ ifeq ($(BUILD_HEADLESS), true) # Mac and Windows only use the native AWT lib, do not build libawt_headless ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) - LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/sun/awt \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ + LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ # LIBAWT_HEADLESS_EXCLUDES := medialib LIBAWT_HEADLESS_CFLAGS := -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ - -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \ $(LIBJAVA_HEADER_FLAGS) \ # @@ -902,9 +902,9 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) LIBAWT_LWAWT_DIRS := \ $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \ - $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \ - $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ + $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ # LIBAWT_LWAWT_CFLAGS := \ @@ -912,24 +912,24 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ - -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl \ - -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \ - -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/sun/awt \ - -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/font \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \ - -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ + -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \ -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \ - -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ + -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ $(LIBJAVA_HEADER_FLAGS) \ # LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c - LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib + LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \ LIBRARY := awt_lwawt, \ @@ -985,7 +985,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \ - -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \ + -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTFont.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/AWTStrike.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CCharToGlyphMapper.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CCharToGlyphMapper.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphImages.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CGGlyphOutlines.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphOutlines.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font/CoreTextSupport.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLGraphicsConfig.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLLayer.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/CGLSurfaceData.m rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/OGLFuncs_md.h similarity index 100% rename from jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/OGLFuncs_md.h rename to jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/OGLFuncs_md.h diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.c b/jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.c rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.h b/jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_assert.h rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_assert.h diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.c b/jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.c rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.h b/jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_mem.h rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_mem.h diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.c b/jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.c rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.h b/jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_trace.h rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_trace.h diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.c b/jdk/src/java.desktop/share/native/common/awt/debug/debug_util.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.c rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_util.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.h b/jdk/src/java.desktop/share/native/common/awt/debug/debug_util.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/debug/debug_util.h rename to jdk/src/java.desktop/share/native/common/awt/debug/debug_util.h diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c b/jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c rename to jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c b/jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c rename to jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c b/jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c rename to jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c diff --git a/jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c b/jdk/src/java.desktop/share/native/common/awt/utility/rect.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c rename to jdk/src/java.desktop/share/native/common/awt/utility/rect.c diff --git a/jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c b/jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c rename to jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c diff --git a/jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h b/jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h rename to jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h diff --git a/jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h b/jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h rename to jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h diff --git a/jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h b/jdk/src/java.desktop/share/native/common/font/sunfontids.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h rename to jdk/src/java.desktop/share/native/common/font/sunfontids.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/gl.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/gl.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/gl.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/gl.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/glext.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/glext.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL/glext.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL/glext.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBlitLoops.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLBufImgOps.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBufImgOps.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLContext.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncMacros.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncMacros.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncMacros.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncMacros.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLFuncs.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLFuncs.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskBlit.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskBlit.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLMaskFill.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLMaskFill.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLPaints.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLPaints.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderQueue.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLRenderer.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLRenderer.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLSurfaceData.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLTextRenderer.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.h diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.c similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.c rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.c diff --git a/jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.h similarity index 100% rename from jdk/src/java.desktop/share/native/common/sun/java2d/opengl/OGLVertexCache.h rename to jdk/src/java.desktop/share/native/common/java2d/opengl/OGLVertexCache.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c b/jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.h b/jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/BufImgSurfaceData.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/DataBufferNative.c b/jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/DataBufferNative.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/DataBufferNative.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_ImageRep.c b/jdk/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_ImageRep.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.c b/jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.h b/jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/awt_parseImage.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/README b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/README similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/README rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/README diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_alpha.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_alpha.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_alpha.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_alpha.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_anycm.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_anycm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_anycm.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_anycm.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.c b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_colors.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_colors.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm8.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm8.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dcm8.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dcm8.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dir8dither.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dir8dither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dir8dither.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dir8dither.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dirdither.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dirdither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_dirdither.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_dirdither.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fscolor.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fscolor.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fscolor.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fscolor.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsdither.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsdither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsdither.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsdither.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsgray.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsgray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsgray.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsgray.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsutil.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsutil.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_fsutil.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_fsutil.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.c b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_globals.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_globals.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_icm.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_icm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_icm.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_icm.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input32.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input32.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input32.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8_32.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_input8_32.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_input8_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_nodither.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_nodither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_nodither.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_nodither.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_noscale.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_noscale.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_noscale.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_noscale.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_opaque.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_opaque.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_opaque.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_opaque.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclrsgn.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclrsgn.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclrsgn.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclrsgn.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclruns.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclruns.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordclruns.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordclruns.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_orddither.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_orddither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_orddither.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_orddither.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordgray.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordgray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_ordgray.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_ordgray.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16_32.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output16_32.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output16_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output24.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output24.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output24.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output24.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output32.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output32.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output32.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_24.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_24.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_24.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_24.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_32.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_16_32.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_16_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_32.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_32.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_output8_32.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_output8_32.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_replscale.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_replscale.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_replscale.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_replscale.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_scaleloop.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_scaleloop.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_scaleloop.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_scaleloop.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_util.h b/jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_util.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils/img_util.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/cvutils/img_util.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.c b/jdk/src/java.desktop/share/native/libawt/awt/image/dither.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/dither.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.h b/jdk/src/java.desktop/share/native/libawt/awt/image/dither.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/dither.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/dither.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c b/jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.c b/jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.c rename to jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.h b/jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/image/imageInitIDs.h rename to jdk/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c b/jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c rename to jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h b/jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h rename to jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.c b/jdk/src/java.desktop/share/native/libawt/java2d/Disposer.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.c rename to jdk/src/java.desktop/share/native/libawt/java2d/Disposer.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.h b/jdk/src/java.desktop/share/native/libawt/java2d/Disposer.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/Disposer.h rename to jdk/src/java.desktop/share/native/libawt/java2d/Disposer.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.c b/jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.c rename to jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.h b/jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/ShaderList.h rename to jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.c b/jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.c rename to jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.h b/jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/SurfaceData.h rename to jdk/src/java.desktop/share/native/libawt/java2d/SurfaceData.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.c b/jdk/src/java.desktop/share/native/libawt/java2d/Trace.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.c rename to jdk/src/java.desktop/share/native/libawt/java2d/Trace.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.h b/jdk/src/java.desktop/share/native/libawt/java2d/Trace.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/Trace.h rename to jdk/src/java.desktop/share/native/libawt/java2d/Trace.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMacros.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMacros.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AlphaMath.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AlphaMath.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any3Byte.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Any3Byte.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Any4Byte.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Any4Byte.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByte.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByte.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByteBinary.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByteBinary.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyByteBinary.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyByteBinary.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyInt.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyInt.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/AnyShort.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/AnyShort.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Blit.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Blit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Blit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Blit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/BlitBg.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/BlitBg.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/BlitBg.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/BlitBg.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary1Bit.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary1Bit.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary2Bit.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary2Bit.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteBinary4Bit.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteBinary4Bit.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteGray.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteGray.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ByteIndexed.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ByteIndexed.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawLine.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawLine.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawLine.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawLine.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawParallelogram.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawParallelogram.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawParallelogram.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawParallelogram.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPath.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPath.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPolygons.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPolygons.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawPolygons.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawPolygons.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawRect.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawRect.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/DrawRect.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/DrawRect.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillParallelogram.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillParallelogram.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillParallelogram.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FillParallelogram.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillPath.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillPath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillPath.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FillPath.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillRect.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillRect.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillRect.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FillRect.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillSpans.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FillSpans.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FillSpans.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FillSpans.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgr.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/FourByteAbgrPre.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/FourByteAbgrPre.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GlyphImageRef.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/GlyphImageRef.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GlyphImageRef.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/GlyphImageRef.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/GraphicsPrimitiveMgr.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ImageData.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ImageData.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index12Gray.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Index12Gray.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Index8Gray.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Index8Gray.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgb.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbBm.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbBm.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntArgbPre.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntArgbPre.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntBgr.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntBgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntDcm.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntDcm.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntDcm.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntDcm.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgb.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/IntRgbx.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/IntRgbx.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LineUtils.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/LineUtils.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LineUtils.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/LineUtils.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LoopMacros.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/LoopMacros.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/LoopMacros.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MapAccelFunc.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MapAccelFunc.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskBlit.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskBlit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskFill.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/MaskFill.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ParallelogramUtils.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ParallelogramUtils.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ParallelogramUtils.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ParallelogramUtils.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ProcessPath.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ScaledBlit.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ScaledBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ScaledBlit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ScaledBlit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/ThreeByteBgr.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/ThreeByteBgr.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/TransformHelper.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/TransformHelper.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort4444Argb.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort4444Argb.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgb.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort555Rgbx.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort555Rgbx.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/Ushort565Rgb.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/Ushort565Rgb.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortGray.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortGray.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.c rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.h b/jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/loops/UshortIndexed.h rename to jdk/src/java.desktop/share/native/libawt/java2d/loops/UshortIndexed.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedMaskBlit.c b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedMaskBlit.c rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedMaskBlit.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedRenderPipe.c b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedRenderPipe.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/BufferedRenderPipe.c rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/BufferedRenderPipe.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/PathConsumer2D.h b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/PathConsumer2D.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/PathConsumer2D.h rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/PathConsumer2D.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.c b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.c rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.h b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/Region.h rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/Region.h diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/ShapeSpanIterator.c b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/ShapeSpanIterator.c rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/ShapeSpanIterator.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanClipRenderer.c b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanClipRenderer.c similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanClipRenderer.c rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanClipRenderer.c diff --git a/jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanIterator.h b/jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanIterator.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe/SpanIterator.h rename to jdk/src/java.desktop/share/native/libawt/java2d/pipe/SpanIterator.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c b/jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c rename to jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c b/jdk/src/java.desktop/unix/native/common/awt/X11Color.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c rename to jdk/src/java.desktop/unix/native/common/awt/X11Color.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt.h b/jdk/src/java.desktop/unix/native/common/awt/awt.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt.h rename to jdk/src/java.desktop/unix/native/common/awt/awt.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h b/jdk/src/java.desktop/unix/native/common/awt/awt_Component.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_Component.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h b/jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c b/jdk/src/java.desktop/unix/native/common/awt/awt_Font.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c rename to jdk/src/java.desktop/unix/native/common/awt/awt_Font.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h b/jdk/src/java.desktop/unix/native/common/awt/awt_Font.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_Font.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h b/jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h b/jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h b/jdk/src/java.desktop/unix/native/common/awt/awt_p.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_p.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h b/jdk/src/java.desktop/unix/native/common/awt/awt_util.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h rename to jdk/src/java.desktop/unix/native/common/awt/awt_util.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/color.h b/jdk/src/java.desktop/unix/native/common/awt/color.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/color.h rename to jdk/src/java.desktop/unix/native/common/awt/color.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h b/jdk/src/java.desktop/unix/native/common/awt/colordata.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h rename to jdk/src/java.desktop/unix/native/common/awt/colordata.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/extutil.h b/jdk/src/java.desktop/unix/native/common/awt/extutil.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/extutil.h rename to jdk/src/java.desktop/unix/native/common/awt/extutil.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h b/jdk/src/java.desktop/unix/native/common/awt/fontconfig.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h rename to jdk/src/java.desktop/unix/native/common/awt/fontconfig.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c b/jdk/src/java.desktop/unix/native/common/awt/fontpath.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c rename to jdk/src/java.desktop/unix/native/common/awt/fontpath.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h b/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h rename to jdk/src/java.desktop/unix/native/common/awt/img_util_md.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c b/jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c rename to jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h b/jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h rename to jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h b/jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h rename to jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h b/jdk/src/java.desktop/unix/native/common/awt/utility/rect.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h rename to jdk/src/java.desktop/unix/native/common/awt/utility/rect.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h b/jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h rename to jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.c b/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.c rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.h b/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXGraphicsConfig.h rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.c b/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.c rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.h b/jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/GLXSurfaceData.h rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/GLXSurfaceData.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glx.h b/jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glx.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glx.h rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glx.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glxext.h b/jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glxext.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL/glxext.h rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL/glxext.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/java.desktop/unix/native/common/java2d/opengl/OGLFuncs_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/OGLFuncs_md.h rename to jdk/src/java.desktop/unix/native/common/java2d/opengl/OGLFuncs_md.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c b/jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c rename to jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c b/jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c rename to jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c b/jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c rename to jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c b/jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c rename to jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h b/jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h rename to jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h diff --git a/jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c b/jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c rename to jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c b/jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c rename to jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c b/jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c rename to jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/awt/initIDs.c b/jdk/src/java.desktop/unix/native/libawt/awt/initIDs.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/awt/initIDs.c rename to jdk/src/java.desktop/unix/native/libawt/awt/initIDs.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c b/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c rename to jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s b/jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s rename to jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h b/jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h rename to jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h b/jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/java2d_Mlib.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageCopy.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageCopy.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageLogic_proto.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageLogic_proto.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom_NN.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_ImageZoom_NN.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageClear_f.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstLogic.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstLogic.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstXor.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageConstXor.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic_proto.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageLogic_proto.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageXor.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageXor.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.h b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMacros.h rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskBlit.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskBlit.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskFill.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_AlphaMaskFill.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_FromRgb.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_FromRgb.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_Mask.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteGray_Mask.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteIndexed.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ByteIndexed.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_DrawLine.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_DrawLine.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgr.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgr.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgrPre.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FourByteAbgrPre.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FuncArray.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_FuncArray.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphList.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphList.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphListXor.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_GlyphListXor.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgb.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgb.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbBm.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbBm.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre_Mask.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntArgbPre_Mask.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntBgr.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntBgr.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgb.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgb.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgbx.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_IntRgbx.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_Interp.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_Interp.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcMaskFill.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcMaskFill.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskBlit.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskBlit.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskFill.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_SrcOverMaskFill.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ThreeByteBgr.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_ThreeByteBgr.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray_FromRgb.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_UshortGray_FromRgb.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c diff --git a/jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_XorBlit.c b/jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops/vis_XorBlit.c rename to jdk/src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c b/jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c rename to jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c b/jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c rename to jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.c diff --git a/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.h b/jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.h rename to jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.h diff --git a/jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingAreaP.h b/jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingAreaP.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingAreaP.h rename to jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingAreaP.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c b/jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c b/jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XToolkit.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XToolkit.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XWindow.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XWindow.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XlibWrapper.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/XlibWrapper.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/awt_Desktop.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/awt_Desktop.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.c rename to jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.h b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h similarity index 100% rename from jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt/gnome_interface.h rename to jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h diff --git a/jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h b/jdk/src/java.desktop/windows/native/common/awt/utility/rect.h similarity index 100% rename from jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h rename to jdk/src/java.desktop/windows/native/common/awt/utility/rect.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBadHardware.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBadHardware.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBadHardware.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBlitLoops.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBlitLoops.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DBufImgOps.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DBufImgOps.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DContext.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DContext.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGlyphCache.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGlyphCache.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DGraphicsDevice.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DGraphicsDevice.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskBlit.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskBlit.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskCache.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskCache.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DMaskFill.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DMaskFill.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPaints.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPaints.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipeline.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipeline.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipeline.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DPipelineManager.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderQueue.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DRenderer.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderer.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DResourceManager.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DResourceManager.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaderGen.c b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaderGen.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaderGen.c rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaderGen.c diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaders.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaders.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DShaders.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DShaders.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DSurfaceData.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DSurfaceData.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DTextRenderer.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DTextRenderer.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d/D3DVertexCacher.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/D3DVertexCacher.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/j2d_md.h b/jdk/src/java.desktop/windows/native/libawt/java2d/j2d_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/j2d_md.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/j2d_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/J2D_GL/wglext.h b/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL/wglext.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/J2D_GL/wglext.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL/wglext.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/OGLFuncs_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/OGLFuncs_md.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/opengl/OGLFuncs_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.c b/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.c rename to jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.c diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.h b/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLGraphicsConfig.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLGraphicsConfig.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.c b/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.c similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.c rename to jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.c diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.h b/jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/opengl/WGLSurfaceData.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/opengl/WGLSurfaceData.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIBlitLoops.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIBlitLoops.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIRenderer.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIRenderer.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIRenderer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.h b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/GDIWindowSurfaceData.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.cpp b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.cpp rename to jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.h b/jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/java2d/windows/WindowsFlags.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h b/jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h rename to jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h b/jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h rename to jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h b/jdk/src/java.desktop/windows/native/libawt/windows/Devices.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h rename to jdk/src/java.desktop/windows/native/libawt/windows/Devices.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h b/jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h rename to jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h b/jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h rename to jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h b/jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h rename to jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h b/jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h rename to jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI b/jdk/src/java.desktop/windows/native/libawt/windows/README.JNI similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI rename to jdk/src/java.desktop/windows/native/libawt/windows/README.JNI diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h b/jdk/src/java.desktop/windows/native/libawt/windows/alloc.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h rename to jdk/src/java.desktop/windows/native/libawt/windows/alloc.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc b/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc rename to jdk/src/java.desktop/windows/native/libawt/windows/awt.rc diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h b/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h rename to jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp b/jdk/src/java.desktop/windows/native/libawt/windows/check.bmp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp rename to jdk/src/java.desktop/windows/native/libawt/windows/check.bmp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h b/jdk/src/java.desktop/windows/native/libawt/windows/colordata.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h rename to jdk/src/java.desktop/windows/native/libawt/windows/colordata.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur b/jdk/src/java.desktop/windows/native/libawt/windows/hand.cur similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur rename to jdk/src/java.desktop/windows/native/libawt/windows/hand.cur diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h b/jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h rename to jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp rename to jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h b/jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h rename to jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico b/jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico rename to jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico b/jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico rename to jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico b/jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico rename to jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico diff --git a/jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h b/jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h similarity index 100% rename from jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h rename to jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h