diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f6a4999e3..02033398cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -417,6 +417,7 @@ set(libpng_private_hdrs
     pngdebug.h
     pnginfo.h
     pngstruct.h
+    target/pngtarget.h
 )
 if(AWK AND NOT (ANDROID OR IOS))
   list(APPEND libpng_private_hdrs "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
@@ -439,7 +440,7 @@ set(libpng_sources
     pngwrite.c
     pngwtran.c
     pngwutil.c
-    pngsimd.c
+    target/pngsimd.c
 )
 set(pngtest_sources
     pngtest.c
diff --git a/Makefile.am b/Makefile.am
index 7ef8a9d0f1..ca164c9928 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,7 +104,7 @@ lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
 	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
 	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
-	pngsimd.c\
+	target/pngsimd.c target/pngtarget.h\
 	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
 
 nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
diff --git a/pngpriv.h b/pngpriv.h
index 102ccbae2c..4335b18211 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -71,7 +71,7 @@
 #  include "pnglibconf.h"
 #endif
 #ifndef PNGTARGET_H
-#  include "pngtarget.h"
+#  include "target/pngtarget.h"
 #endif
 
 /* Local renames may change non-exported API functions from png.h */
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index adae669c26..5ee2b16bed 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -40,7 +40,7 @@ PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
 # File lists
 OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
        pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
-       pngsimd.o pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+       target/pngsimd.o pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
 
 # Targets
 all: libpng.a pngtest$(EXEEXT)
@@ -69,20 +69,21 @@ clean:
 # unfortunately this cannot be done in a way that is independent of your
 # make implementation.
 
-png.o:      png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngget.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngmem.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngread.o:  png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngrio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngset.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
+png.o:      png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngget.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngmem.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngread.o:  png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngrio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngset.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+target/pngsimd.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
 
 pngtest.o:  png.h pngconf.h pnglibconf.h
diff --git a/scripts/makefile.std b/scripts/makefile.std
index ba7adda03c..cba2aefc10 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -36,7 +36,7 @@ PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
 
 OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
        pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
-       pngsimd.o pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+       target/pngsimd.o pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
 
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -83,21 +83,21 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-png.o:      png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngget.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngmem.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngread.o:  png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngrio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngset.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngsimd.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
-pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngtarget.h
+png.o:      png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngget.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngmem.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngread.o:  png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngrio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngset.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+target/pngsimd.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwio.o:   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
+pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h target/pngtarget.h
 
 pngtest.o:  png.h pngconf.h pnglibconf.h
diff --git a/arm/arm_init.c b/target/arm/arm_init.c
similarity index 100%
rename from arm/arm_init.c
rename to target/arm/arm_init.c
diff --git a/arm/check.h b/target/arm/check.h
similarity index 100%
rename from arm/check.h
rename to target/arm/check.h
diff --git a/arm/filter_neon.S b/target/arm/filter_neon.S
similarity index 100%
rename from arm/filter_neon.S
rename to target/arm/filter_neon.S
diff --git a/arm/filter_neon_intrinsics.c b/target/arm/filter_neon_intrinsics.c
similarity index 100%
rename from arm/filter_neon_intrinsics.c
rename to target/arm/filter_neon_intrinsics.c
diff --git a/arm/palette_neon_intrinsics.c b/target/arm/palette_neon_intrinsics.c
similarity index 100%
rename from arm/palette_neon_intrinsics.c
rename to target/arm/palette_neon_intrinsics.c
diff --git a/intel/check.h b/target/intel/check.h
similarity index 100%
rename from intel/check.h
rename to target/intel/check.h
diff --git a/intel/filter_sse2_intrinsics.c b/target/intel/filter_sse2_intrinsics.c
similarity index 100%
rename from intel/filter_sse2_intrinsics.c
rename to target/intel/filter_sse2_intrinsics.c
diff --git a/intel/intel_init.c b/target/intel/intel_init.c
similarity index 100%
rename from intel/intel_init.c
rename to target/intel/intel_init.c
diff --git a/loongarch/.editorconfig b/target/loongarch/.editorconfig
similarity index 100%
rename from loongarch/.editorconfig
rename to target/loongarch/.editorconfig
diff --git a/loongarch/filter_lsx_intrinsics.c b/target/loongarch/filter_lsx_intrinsics.c
similarity index 100%
rename from loongarch/filter_lsx_intrinsics.c
rename to target/loongarch/filter_lsx_intrinsics.c
diff --git a/loongarch/loongarch_lsx_init.c b/target/loongarch/loongarch_lsx_init.c
similarity index 100%
rename from loongarch/loongarch_lsx_init.c
rename to target/loongarch/loongarch_lsx_init.c
diff --git a/mips/.editorconfig b/target/mips/.editorconfig
similarity index 100%
rename from mips/.editorconfig
rename to target/mips/.editorconfig
diff --git a/mips/check.h b/target/mips/check.h
similarity index 100%
rename from mips/check.h
rename to target/mips/check.h
diff --git a/mips/filter_mmi_inline_assembly.c b/target/mips/filter_mmi_inline_assembly.c
similarity index 100%
rename from mips/filter_mmi_inline_assembly.c
rename to target/mips/filter_mmi_inline_assembly.c
diff --git a/mips/filter_msa_intrinsics.c b/target/mips/filter_msa_intrinsics.c
similarity index 100%
rename from mips/filter_msa_intrinsics.c
rename to target/mips/filter_msa_intrinsics.c
diff --git a/mips/mips_init.c b/target/mips/mips_init.c
similarity index 100%
rename from mips/mips_init.c
rename to target/mips/mips_init.c
diff --git a/mips/msacheck.h b/target/mips/msacheck.h
similarity index 100%
rename from mips/msacheck.h
rename to target/mips/msacheck.h
diff --git a/pngsimd.c b/target/pngsimd.c
similarity index 100%
rename from pngsimd.c
rename to target/pngsimd.c
diff --git a/pngtarget.h b/target/pngtarget.h
similarity index 100%
rename from pngtarget.h
rename to target/pngtarget.h
diff --git a/powerpc/.editorconfig b/target/powerpc/.editorconfig
similarity index 100%
rename from powerpc/.editorconfig
rename to target/powerpc/.editorconfig
diff --git a/powerpc/check.h b/target/powerpc/check.h
similarity index 100%
rename from powerpc/check.h
rename to target/powerpc/check.h
diff --git a/powerpc/filter_vsx_intrinsics.c b/target/powerpc/filter_vsx_intrinsics.c
similarity index 100%
rename from powerpc/filter_vsx_intrinsics.c
rename to target/powerpc/filter_vsx_intrinsics.c
diff --git a/powerpc/powerpc_init.c b/target/powerpc/powerpc_init.c
similarity index 100%
rename from powerpc/powerpc_init.c
rename to target/powerpc/powerpc_init.c