diff --git a/drivers/png/SCsub b/drivers/png/SCsub
index b173710..fa5e4bc 100644
--- a/drivers/png/SCsub
+++ b/drivers/png/SCsub
@@ -9,7 +9,7 @@ env_png = env.Clone()
 thirdparty_obj = []
 
 if env["builtin_libpng"]:
-    thirdparty_dir = "#thirdparty/libpng/"
+    thirdparty_dir = "libpng/"
     thirdparty_sources = [
         "png.c",
         "pngerror.c",
diff --git a/thirdparty/libpng/LICENSE b/drivers/png/libpng/LICENSE
similarity index 100%
rename from thirdparty/libpng/LICENSE
rename to drivers/png/libpng/LICENSE
diff --git a/thirdparty/libpng/arm/arm_init.c b/drivers/png/libpng/arm/arm_init.c
similarity index 100%
rename from thirdparty/libpng/arm/arm_init.c
rename to drivers/png/libpng/arm/arm_init.c
diff --git a/thirdparty/libpng/arm/filter_neon.S b/drivers/png/libpng/arm/filter_neon.S
similarity index 100%
rename from thirdparty/libpng/arm/filter_neon.S
rename to drivers/png/libpng/arm/filter_neon.S
diff --git a/thirdparty/libpng/arm/filter_neon_intrinsics.c b/drivers/png/libpng/arm/filter_neon_intrinsics.c
similarity index 100%
rename from thirdparty/libpng/arm/filter_neon_intrinsics.c
rename to drivers/png/libpng/arm/filter_neon_intrinsics.c
diff --git a/thirdparty/libpng/arm/palette_neon_intrinsics.c b/drivers/png/libpng/arm/palette_neon_intrinsics.c
similarity index 100%
rename from thirdparty/libpng/arm/palette_neon_intrinsics.c
rename to drivers/png/libpng/arm/palette_neon_intrinsics.c
diff --git a/thirdparty/libpng/png.c b/drivers/png/libpng/png.c
similarity index 100%
rename from thirdparty/libpng/png.c
rename to drivers/png/libpng/png.c
diff --git a/thirdparty/libpng/png.h b/drivers/png/libpng/png.h
similarity index 100%
rename from thirdparty/libpng/png.h
rename to drivers/png/libpng/png.h
diff --git a/thirdparty/libpng/pngconf.h b/drivers/png/libpng/pngconf.h
similarity index 100%
rename from thirdparty/libpng/pngconf.h
rename to drivers/png/libpng/pngconf.h
diff --git a/thirdparty/libpng/pngdebug.h b/drivers/png/libpng/pngdebug.h
similarity index 100%
rename from thirdparty/libpng/pngdebug.h
rename to drivers/png/libpng/pngdebug.h
diff --git a/thirdparty/libpng/pngerror.c b/drivers/png/libpng/pngerror.c
similarity index 100%
rename from thirdparty/libpng/pngerror.c
rename to drivers/png/libpng/pngerror.c
diff --git a/thirdparty/libpng/pngget.c b/drivers/png/libpng/pngget.c
similarity index 100%
rename from thirdparty/libpng/pngget.c
rename to drivers/png/libpng/pngget.c
diff --git a/thirdparty/libpng/pnginfo.h b/drivers/png/libpng/pnginfo.h
similarity index 100%
rename from thirdparty/libpng/pnginfo.h
rename to drivers/png/libpng/pnginfo.h
diff --git a/thirdparty/libpng/pnglibconf.h b/drivers/png/libpng/pnglibconf.h
similarity index 100%
rename from thirdparty/libpng/pnglibconf.h
rename to drivers/png/libpng/pnglibconf.h
diff --git a/thirdparty/libpng/pngmem.c b/drivers/png/libpng/pngmem.c
similarity index 100%
rename from thirdparty/libpng/pngmem.c
rename to drivers/png/libpng/pngmem.c
diff --git a/thirdparty/libpng/pngpread.c b/drivers/png/libpng/pngpread.c
similarity index 100%
rename from thirdparty/libpng/pngpread.c
rename to drivers/png/libpng/pngpread.c
diff --git a/thirdparty/libpng/pngpriv.h b/drivers/png/libpng/pngpriv.h
similarity index 100%
rename from thirdparty/libpng/pngpriv.h
rename to drivers/png/libpng/pngpriv.h
diff --git a/thirdparty/libpng/pngread.c b/drivers/png/libpng/pngread.c
similarity index 100%
rename from thirdparty/libpng/pngread.c
rename to drivers/png/libpng/pngread.c
diff --git a/thirdparty/libpng/pngrio.c b/drivers/png/libpng/pngrio.c
similarity index 100%
rename from thirdparty/libpng/pngrio.c
rename to drivers/png/libpng/pngrio.c
diff --git a/thirdparty/libpng/pngrtran.c b/drivers/png/libpng/pngrtran.c
similarity index 100%
rename from thirdparty/libpng/pngrtran.c
rename to drivers/png/libpng/pngrtran.c
diff --git a/thirdparty/libpng/pngrutil.c b/drivers/png/libpng/pngrutil.c
similarity index 100%
rename from thirdparty/libpng/pngrutil.c
rename to drivers/png/libpng/pngrutil.c
diff --git a/thirdparty/libpng/pngset.c b/drivers/png/libpng/pngset.c
similarity index 100%
rename from thirdparty/libpng/pngset.c
rename to drivers/png/libpng/pngset.c
diff --git a/thirdparty/libpng/pngstruct.h b/drivers/png/libpng/pngstruct.h
similarity index 100%
rename from thirdparty/libpng/pngstruct.h
rename to drivers/png/libpng/pngstruct.h
diff --git a/thirdparty/libpng/pngtrans.c b/drivers/png/libpng/pngtrans.c
similarity index 100%
rename from thirdparty/libpng/pngtrans.c
rename to drivers/png/libpng/pngtrans.c
diff --git a/thirdparty/libpng/pngwio.c b/drivers/png/libpng/pngwio.c
similarity index 100%
rename from thirdparty/libpng/pngwio.c
rename to drivers/png/libpng/pngwio.c
diff --git a/thirdparty/libpng/pngwrite.c b/drivers/png/libpng/pngwrite.c
similarity index 100%
rename from thirdparty/libpng/pngwrite.c
rename to drivers/png/libpng/pngwrite.c
diff --git a/thirdparty/libpng/pngwtran.c b/drivers/png/libpng/pngwtran.c
similarity index 100%
rename from thirdparty/libpng/pngwtran.c
rename to drivers/png/libpng/pngwtran.c
diff --git a/thirdparty/libpng/pngwutil.c b/drivers/png/libpng/pngwutil.c
similarity index 100%
rename from thirdparty/libpng/pngwutil.c
rename to drivers/png/libpng/pngwutil.c