diff --git a/Makefile.am b/Makefile.am
index 9b864fa..631df6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -767,43 +767,28 @@
   composer.json                                                       \
   php/README.md                                                       \
   php/composer.json                                                   \
+  php/ext/google/protobuf/arena.c                                     \
+  php/ext/google/protobuf/arena.h                                     \
   php/ext/google/protobuf/array.c                                     \
-  php/ext/google/protobuf/builtin_descriptors.inc                     \
+  php/ext/google/protobuf/array.h                                     \
+  php/ext/google/protobuf/bundled_php.h                               \
   php/ext/google/protobuf/config.m4                                   \
+  php/ext/google/protobuf/convert.c                                   \
+  php/ext/google/protobuf/convert.h                                   \
   php/ext/google/protobuf/def.c                                       \
-  php/ext/google/protobuf/encode_decode.c                             \
+  php/ext/google/protobuf/def.h                                       \
+  php/ext/google/protobuf/make-preload.php                            \
   php/ext/google/protobuf/map.c                                       \
+  php/ext/google/protobuf/map.h                                       \
   php/ext/google/protobuf/message.c                                   \
+  php/ext/google/protobuf/message.h                                   \
+  php/ext/google/protobuf/names.c                                     \
+  php/ext/google/protobuf/names.h                                     \
   php/ext/google/protobuf/package.xml                                 \
+  php/ext/google/protobuf/php-upb.c                                   \
+  php/ext/google/protobuf/php-upb.h                                   \
   php/ext/google/protobuf/protobuf.c                                  \
   php/ext/google/protobuf/protobuf.h                                  \
-  php/ext/google/protobuf/storage.c                                   \
-  php/ext/google/protobuf/type_check.c                                \
-  php/ext/google/protobuf/upb.c                                       \
-  php/ext/google/protobuf/upb.h                                       \
-  php/ext/google/protobuf/utf8.c                                      \
-  php/ext/google/protobuf/utf8.h                                      \
-  php/ext/google/protobuf2/arena.c                                    \
-  php/ext/google/protobuf2/arena.h                                    \
-  php/ext/google/protobuf2/array.c                                    \
-  php/ext/google/protobuf2/array.h                                    \
-  php/ext/google/protobuf2/bundled_php.h                              \
-  php/ext/google/protobuf2/config.m4                                  \
-  php/ext/google/protobuf2/convert.c                                  \
-  php/ext/google/protobuf2/convert.h                                  \
-  php/ext/google/protobuf2/def.c                                      \
-  php/ext/google/protobuf2/def.h                                      \
-  php/ext/google/protobuf2/make-preload.php                           \
-  php/ext/google/protobuf2/map.c                                      \
-  php/ext/google/protobuf2/map.h                                      \
-  php/ext/google/protobuf2/message.c                                  \
-  php/ext/google/protobuf2/message.h                                  \
-  php/ext/google/protobuf2/names.c                                    \
-  php/ext/google/protobuf2/names.h                                    \
-  php/ext/google/protobuf2/php-upb.c                                  \
-  php/ext/google/protobuf2/php-upb.h                                  \
-  php/ext/google/protobuf2/protobuf.c                                 \
-  php/ext/google/protobuf2/protobuf.h                                 \
   php/generate_descriptor_protos.sh                                   \
   php/phpunit.xml                                                     \
   php/release.sh                                                      \