diff --git a/configure.ac b/configure.ac
index 13ac94006b5..12a59d39ae2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1955,12 +1955,24 @@ AC_CONFIG_FILES([
   mgmt/cluster/Makefile
   mgmt/utils/Makefile
   plugins/Makefile
+  plugins/authproxy/Makefile
+  plugins/background_fetch/Makefile
   plugins/cacheurl/Makefile
   plugins/conf_remap/Makefile
+  plugins/esi/Makefile
+  plugins/generator/Makefile
+  plugins/gzip/Makefile
+  plugins/header_rewrite/Makefile
+  plugins/healthchecks/Makefile
+  plugins/libloader/Makefile
+  plugins/regex_remap/Makefile
+  plugins/regex_revalidate/Makefile
+  plugins/s3_auth/Makefile
+  plugins/stats_over_http/Makefile
+  plugins/tcpinfo/Makefile
+  plugins/xdebug/Makefile
   plugins/experimental/Makefile
   plugins/experimental/acme/Makefile
-  plugins/experimental/authproxy/Makefile
-  plugins/experimental/background_fetch/Makefile
   plugins/experimental/balancer/Makefile
   plugins/experimental/buffer_upload/Makefile
   plugins/experimental/cache_key_genid/Makefile
@@ -1973,8 +1985,6 @@ AC_CONFIG_FILES([
   plugins/experimental/custom_redirect/Makefile
   plugins/experimental/epic/Makefile
   plugins/experimental/escalate/Makefile
-  plugins/experimental/esi/Makefile
-  plugins/experimental/generator/Makefile
   plugins/experimental/geoip_acl/Makefile
   plugins/experimental/header_normalize/Makefile
   plugins/experimental/hipes/Makefile
@@ -1985,10 +1995,8 @@ AC_CONFIG_FILES([
   plugins/experimental/mp4/Makefile
   plugins/experimental/multiplexer/Makefile
   plugins/experimental/mysql_remap/Makefile
-  plugins/experimental/regex_revalidate/Makefile
-  plugins/experimental/remap_stats/Makefile
   plugins/experimental/remap_purge/Makefile
-  plugins/experimental/s3_auth/Makefile
+  plugins/experimental/remap_stats/Makefile
   plugins/experimental/ssl_cert_loader/Makefile
   plugins/experimental/sslheaders/Makefile
   plugins/experimental/stale_while_revalidate/Makefile
@@ -1996,14 +2004,6 @@ AC_CONFIG_FILES([
   plugins/experimental/ts_lua/Makefile
   plugins/experimental/url_sig/Makefile
   plugins/experimental/webp_transform/Makefile
-  plugins/experimental/xdebug/Makefile
-  plugins/gzip/Makefile
-  plugins/header_rewrite/Makefile
-  plugins/healthchecks/Makefile
-  plugins/libloader/Makefile
-  plugins/regex_remap/Makefile
-  plugins/stats_over_http/Makefile
-  plugins/tcpinfo/Makefile
   proxy/Makefile
   proxy/api/ts/Makefile
   proxy/config/Makefile
diff --git a/doc/admin-guide/plugins/index.en.rst b/doc/admin-guide/plugins/index.en.rst
index 37b1c537ae7..acd4f221ff1 100644
--- a/doc/admin-guide/plugins/index.en.rst
+++ b/doc/admin-guide/plugins/index.en.rst
@@ -45,14 +45,30 @@ Plugins that are considered stable are installed by default in |TS| releases.
 .. toctree::
    :hidden:
 
+   AuthProxy <authproxy.en>
+   AWS S3 Authentication <s3_auth.en>
+   Background Fetch <background_fetch.en>
    Cache URL <cacheurl.en>
    Configuration Remap <conf_remap.en>
+   ESI <esi.en>
+   Generator <generator.en>
    GZip <gzip.en>
    Header Rewrite <header_rewrite.en>
    Health Checks <healthchecks.en>
    Regex Remap <regex_remap.en>
+   Regex Revalidate <regex_revalidate.en>
    Stats over HTTP <stats_over_http.en>
    TCPInfo <tcpinfo.en>
+   XDebug <xdebug.en>
+
+:doc:`AuthProxy <authproxy.en>`
+   Delegates the authorization decision of a request to an external HTTP service.
+
+:doc:`AWS S3 Authentication <s3_auth.en>`
+   Support for Amazon S3 authentication features.
+
+:doc:`Background Fetch <background_fetch.en>`
+   Proactively fetch content from Origin in a way that it will fill the object into cache.
 
 :doc:`Cache URL <cacheurl.en>`
     Modify the :term:`cache key` used for requests by applying a regular
@@ -61,6 +77,12 @@ Plugins that are considered stable are installed by default in |TS| releases.
 :doc:`Configuration Remap <conf_remap.en>`
     Override configuration directives on a per-rule basis.
 
+:doc:`ESI <esi.en>`
+   Implements the Edge Side Includes (ESI) specification.
+
+:doc:`Generator <generator.en>`
+   Generate arbitrary response data.
+
 :doc:`GZip <gzip.en>`
     Compress or deflate cache responses.
 
@@ -74,12 +96,18 @@ Plugins that are considered stable are installed by default in |TS| releases.
 :doc:`Regex Remap <regex_remap.en>`
     Configure remapping rules using regular expressions.
 
+:doc:`Regex Revalidate <regex_revalidate.en>`
+   Configurable rules for forcing cache object revalidations using regular expressions.
+
 :doc:`Stats over HTTP <stats_over_http.en>`
     Provide an HTTP interface to all |TS| statistics.
 
 :doc:`TCPInfo <tcpinfo.en>`
     Log TCP metrics at various points of the HTTP processing pipeline.
 
+:doc:`XDebug <xdebug.en>`
+   Allows HTTP clients to debug the operation of the Traffic Server cache using the X-Debug header.
+
 Experimental plugins
 ====================
 
@@ -95,41 +123,25 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
 .. toctree::
    :hidden:
 
-   AuthProxy <authproxy.en>
-   AWS S3 Authentication <s3_auth.en>
-   Background Fetch <background_fetch.en>
    Balancer <balancer.en>
    Buffer Upload <buffer_upload.en>
    Cache Key Manipulation <cachekey.en>
    Cache Promote <cache_promote.en>
+   Collapsed-Forwarding <collapsed_forwarding.en>
    Combo Handler <combo_handler.en>
    Epic <epic.en>
    Escalate <escalate.en>
-   ESI <esi.en>
-   Generator <generator.en>
    GeoIP ACL <geoip_acl.en>
    HIPES <hipes.en>
    Memcache <memcache.en>
    Metalink <metalink.en>
    MP4 <mp4.en>
    MySQL Remap <mysql_remap.en>
-   Regex Revalidate <regex_revalidate.en>
    Signed URLs <url_sig.en>
    SSL Headers <sslheaders.en>
    Stale While Revalidate <stale_while_revalidate.en>
    TS Lua <ts_lua.en>
    WebP Transform <webp_transform.en>
-   XDebug <xdebug.en>
-   Collapsed-Forwarding <collapsed_forwarding.en>
-
-:doc:`AuthProxy <authproxy.en>`
-   Delegates the authorization decision of a request to an external HTTP service.
-
-:doc:`AWS S3 Authentication <s3_auth.en>`
-   Support for Amazon S3 authentication features.
-
-:doc:`Background Fetch <background_fetch.en>`
-   Proactively fetch content from Origin in a way that it will fill the object into cache.
 
 :doc:`Balancer <balancer.en>`
    Balances requests across multiple origin servers.
@@ -143,6 +155,10 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
 :doc:`Cache Promote <cache_promote.en>`
    Provides additional control over when an object should be allowed into the cache.
 
+:doc:`Collapsed-Forwarding <collapsed_forwarding.en>`
+   Allows to Collapse multiple Concurrent requests by downloading once from the Origin and serving
+   all clients in parallel.
+
 :doc:`Combo Handler <combo_handler.en>`
    Provides an intelligent way to combine multiple URLs into a single URL, and have Apache Traffic Server combine the components into one response.
 
@@ -152,12 +168,6 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
 :doc:`Escalate <escalate.en>`
    Escalate: when the origin returns specific status codes, retry the request at a secondary origin (failover/fail-action)
 
-:doc:`ESI <esi.en>`
-   Implements the Edge Side Includes (ESI) specification.
-
-:doc:`Generator <generator.en>`
-   Generate arbitrary response data.
-
 :doc:`GeoIP ACL <geoip_acl.en>`
    Deny or allow requests based on the source IP geo-location.
 
@@ -176,9 +186,6 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
 :doc:`MySQL Remap <mysql_remap.en>`
    Allows dynamic remaps from a MySQL database.
 
-:doc:`Regex Revalidate <regex_revalidate.en>`
-   Configurable rules for forcing cache object revalidations using regular expressions.
-
 :doc:`Signed URLs <url_sig.en>`
    Adds support for verifying URL signatures for incoming requests to either deny or redirect access.
 
@@ -193,11 +200,3 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
 
 :doc:`WebP Transform <webp_transform.en>`
    Converts jpeg and png images to webp format.
-
-:doc:`XDebug <xdebug.en>`
-   Allows HTTP clients to debug the operation of the Traffic Server cache using the X-Debug header.
-
-:doc:`Collapsed-Forwarding <collapsed_forwarding.en>`
-   Allows to Collapse multiple Concurrent requests by downloading once from the Origin and serving
-   all clients in parallel.
-
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2f4d9df7f2a..43de8213a88 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -17,15 +17,22 @@
 # Add new plugins in alphabetic order, but keep experimental always at the bottom.
 
 SUBDIRS = \
+  authproxy \
+  background_fetch \
   cacheurl \
   conf_remap \
+  esi \
+  generator \
   gzip \
   header_rewrite \
   healthchecks \
   libloader \
   regex_remap \
+  regex_revalidate \
+  s3_auth \
   stats_over_http \
-  tcpinfo
+  tcpinfo \
+  xdebug
 
 if BUILD_EXPERIMENTAL_PLUGINS
 SUBDIRS += experimental
diff --git a/plugins/experimental/authproxy/Makefile.am b/plugins/authproxy/Makefile.am
similarity index 100%
rename from plugins/experimental/authproxy/Makefile.am
rename to plugins/authproxy/Makefile.am
diff --git a/plugins/experimental/authproxy/authproxy.cc b/plugins/authproxy/authproxy.cc
similarity index 100%
rename from plugins/experimental/authproxy/authproxy.cc
rename to plugins/authproxy/authproxy.cc
diff --git a/plugins/experimental/authproxy/utils.cc b/plugins/authproxy/utils.cc
similarity index 100%
rename from plugins/experimental/authproxy/utils.cc
rename to plugins/authproxy/utils.cc
diff --git a/plugins/experimental/authproxy/utils.h b/plugins/authproxy/utils.h
similarity index 100%
rename from plugins/experimental/authproxy/utils.h
rename to plugins/authproxy/utils.h
diff --git a/plugins/experimental/background_fetch/Makefile.am b/plugins/background_fetch/Makefile.am
similarity index 100%
rename from plugins/experimental/background_fetch/Makefile.am
rename to plugins/background_fetch/Makefile.am
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/background_fetch/background_fetch.cc
similarity index 100%
rename from plugins/experimental/background_fetch/background_fetch.cc
rename to plugins/background_fetch/background_fetch.cc
diff --git a/plugins/experimental/background_fetch/configs.cc b/plugins/background_fetch/configs.cc
similarity index 100%
rename from plugins/experimental/background_fetch/configs.cc
rename to plugins/background_fetch/configs.cc
diff --git a/plugins/experimental/background_fetch/configs.h b/plugins/background_fetch/configs.h
similarity index 100%
rename from plugins/experimental/background_fetch/configs.h
rename to plugins/background_fetch/configs.h
diff --git a/plugins/experimental/background_fetch/headers.cc b/plugins/background_fetch/headers.cc
similarity index 100%
rename from plugins/experimental/background_fetch/headers.cc
rename to plugins/background_fetch/headers.cc
diff --git a/plugins/experimental/background_fetch/headers.h b/plugins/background_fetch/headers.h
similarity index 100%
rename from plugins/experimental/background_fetch/headers.h
rename to plugins/background_fetch/headers.h
diff --git a/plugins/experimental/background_fetch/rules.cc b/plugins/background_fetch/rules.cc
similarity index 100%
rename from plugins/experimental/background_fetch/rules.cc
rename to plugins/background_fetch/rules.cc
diff --git a/plugins/experimental/background_fetch/rules.h b/plugins/background_fetch/rules.h
similarity index 100%
rename from plugins/experimental/background_fetch/rules.h
rename to plugins/background_fetch/rules.h
diff --git a/plugins/experimental/esi/Makefile.am b/plugins/esi/Makefile.am
similarity index 100%
rename from plugins/experimental/esi/Makefile.am
rename to plugins/esi/Makefile.am
diff --git a/plugins/experimental/esi/README b/plugins/esi/README
similarity index 100%
rename from plugins/experimental/esi/README
rename to plugins/esi/README
diff --git a/plugins/experimental/esi/README.combo b/plugins/esi/README.combo
similarity index 100%
rename from plugins/experimental/esi/README.combo
rename to plugins/esi/README.combo
diff --git a/plugins/experimental/esi/combo_handler.cc b/plugins/esi/combo_handler.cc
similarity index 100%
rename from plugins/experimental/esi/combo_handler.cc
rename to plugins/esi/combo_handler.cc
diff --git a/plugins/experimental/esi/esi.cc b/plugins/esi/esi.cc
similarity index 100%
rename from plugins/experimental/esi/esi.cc
rename to plugins/esi/esi.cc
diff --git a/plugins/experimental/esi/fetcher/FetchedDataProcessor.h b/plugins/esi/fetcher/FetchedDataProcessor.h
similarity index 100%
rename from plugins/experimental/esi/fetcher/FetchedDataProcessor.h
rename to plugins/esi/fetcher/FetchedDataProcessor.h
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcher.h b/plugins/esi/fetcher/HttpDataFetcher.h
similarity index 100%
rename from plugins/experimental/esi/fetcher/HttpDataFetcher.h
rename to plugins/esi/fetcher/HttpDataFetcher.h
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc b/plugins/esi/fetcher/HttpDataFetcherImpl.cc
similarity index 100%
rename from plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
rename to plugins/esi/fetcher/HttpDataFetcherImpl.cc
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h b/plugins/esi/fetcher/HttpDataFetcherImpl.h
similarity index 100%
rename from plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
rename to plugins/esi/fetcher/HttpDataFetcherImpl.h
diff --git a/plugins/experimental/esi/handlers.cfg b/plugins/esi/handlers.cfg
similarity index 100%
rename from plugins/experimental/esi/handlers.cfg
rename to plugins/esi/handlers.cfg
diff --git a/plugins/experimental/esi/lib/Attribute.h b/plugins/esi/lib/Attribute.h
similarity index 100%
rename from plugins/experimental/esi/lib/Attribute.h
rename to plugins/esi/lib/Attribute.h
diff --git a/plugins/experimental/esi/lib/ComponentBase.h b/plugins/esi/lib/ComponentBase.h
similarity index 100%
rename from plugins/experimental/esi/lib/ComponentBase.h
rename to plugins/esi/lib/ComponentBase.h
diff --git a/plugins/experimental/esi/lib/DocNode.cc b/plugins/esi/lib/DocNode.cc
similarity index 100%
rename from plugins/experimental/esi/lib/DocNode.cc
rename to plugins/esi/lib/DocNode.cc
diff --git a/plugins/experimental/esi/lib/DocNode.h b/plugins/esi/lib/DocNode.h
similarity index 100%
rename from plugins/experimental/esi/lib/DocNode.h
rename to plugins/esi/lib/DocNode.h
diff --git a/plugins/experimental/esi/lib/EsiGunzip.cc b/plugins/esi/lib/EsiGunzip.cc
similarity index 100%
rename from plugins/experimental/esi/lib/EsiGunzip.cc
rename to plugins/esi/lib/EsiGunzip.cc
diff --git a/plugins/experimental/esi/lib/EsiGunzip.h b/plugins/esi/lib/EsiGunzip.h
similarity index 100%
rename from plugins/experimental/esi/lib/EsiGunzip.h
rename to plugins/esi/lib/EsiGunzip.h
diff --git a/plugins/experimental/esi/lib/EsiGzip.cc b/plugins/esi/lib/EsiGzip.cc
similarity index 100%
rename from plugins/experimental/esi/lib/EsiGzip.cc
rename to plugins/esi/lib/EsiGzip.cc
diff --git a/plugins/experimental/esi/lib/EsiGzip.h b/plugins/esi/lib/EsiGzip.h
similarity index 100%
rename from plugins/experimental/esi/lib/EsiGzip.h
rename to plugins/esi/lib/EsiGzip.h
diff --git a/plugins/experimental/esi/lib/EsiParser.cc b/plugins/esi/lib/EsiParser.cc
similarity index 100%
rename from plugins/experimental/esi/lib/EsiParser.cc
rename to plugins/esi/lib/EsiParser.cc
diff --git a/plugins/experimental/esi/lib/EsiParser.h b/plugins/esi/lib/EsiParser.h
similarity index 100%
rename from plugins/experimental/esi/lib/EsiParser.h
rename to plugins/esi/lib/EsiParser.h
diff --git a/plugins/experimental/esi/lib/EsiProcessor.cc b/plugins/esi/lib/EsiProcessor.cc
similarity index 100%
rename from plugins/experimental/esi/lib/EsiProcessor.cc
rename to plugins/esi/lib/EsiProcessor.cc
diff --git a/plugins/experimental/esi/lib/EsiProcessor.h b/plugins/esi/lib/EsiProcessor.h
similarity index 100%
rename from plugins/experimental/esi/lib/EsiProcessor.h
rename to plugins/esi/lib/EsiProcessor.h
diff --git a/plugins/experimental/esi/lib/Expression.cc b/plugins/esi/lib/Expression.cc
similarity index 100%
rename from plugins/experimental/esi/lib/Expression.cc
rename to plugins/esi/lib/Expression.cc
diff --git a/plugins/experimental/esi/lib/Expression.h b/plugins/esi/lib/Expression.h
similarity index 100%
rename from plugins/experimental/esi/lib/Expression.h
rename to plugins/esi/lib/Expression.h
diff --git a/plugins/experimental/esi/lib/FailureInfo.cc b/plugins/esi/lib/FailureInfo.cc
similarity index 100%
rename from plugins/experimental/esi/lib/FailureInfo.cc
rename to plugins/esi/lib/FailureInfo.cc
diff --git a/plugins/experimental/esi/lib/FailureInfo.h b/plugins/esi/lib/FailureInfo.h
similarity index 100%
rename from plugins/experimental/esi/lib/FailureInfo.h
rename to plugins/esi/lib/FailureInfo.h
diff --git a/plugins/experimental/esi/lib/HandlerManager.cc b/plugins/esi/lib/HandlerManager.cc
similarity index 100%
rename from plugins/experimental/esi/lib/HandlerManager.cc
rename to plugins/esi/lib/HandlerManager.cc
diff --git a/plugins/experimental/esi/lib/HandlerManager.h b/plugins/esi/lib/HandlerManager.h
similarity index 100%
rename from plugins/experimental/esi/lib/HandlerManager.h
rename to plugins/esi/lib/HandlerManager.h
diff --git a/plugins/experimental/esi/lib/HttpHeader.h b/plugins/esi/lib/HttpHeader.h
similarity index 100%
rename from plugins/experimental/esi/lib/HttpHeader.h
rename to plugins/esi/lib/HttpHeader.h
diff --git a/plugins/experimental/esi/lib/IncludeHandlerFactory.h b/plugins/esi/lib/IncludeHandlerFactory.h
similarity index 100%
rename from plugins/experimental/esi/lib/IncludeHandlerFactory.h
rename to plugins/esi/lib/IncludeHandlerFactory.h
diff --git a/plugins/experimental/esi/lib/SpecialIncludeHandler.h b/plugins/esi/lib/SpecialIncludeHandler.h
similarity index 100%
rename from plugins/experimental/esi/lib/SpecialIncludeHandler.h
rename to plugins/esi/lib/SpecialIncludeHandler.h
diff --git a/plugins/experimental/esi/lib/Stats.cc b/plugins/esi/lib/Stats.cc
similarity index 100%
rename from plugins/experimental/esi/lib/Stats.cc
rename to plugins/esi/lib/Stats.cc
diff --git a/plugins/experimental/esi/lib/Stats.h b/plugins/esi/lib/Stats.h
similarity index 100%
rename from plugins/experimental/esi/lib/Stats.h
rename to plugins/esi/lib/Stats.h
diff --git a/plugins/experimental/esi/lib/StringHash.h b/plugins/esi/lib/StringHash.h
similarity index 100%
rename from plugins/experimental/esi/lib/StringHash.h
rename to plugins/esi/lib/StringHash.h
diff --git a/plugins/experimental/esi/lib/Utils.cc b/plugins/esi/lib/Utils.cc
similarity index 100%
rename from plugins/experimental/esi/lib/Utils.cc
rename to plugins/esi/lib/Utils.cc
diff --git a/plugins/experimental/esi/lib/Utils.h b/plugins/esi/lib/Utils.h
similarity index 100%
rename from plugins/experimental/esi/lib/Utils.h
rename to plugins/esi/lib/Utils.h
diff --git a/plugins/experimental/esi/lib/Variables.cc b/plugins/esi/lib/Variables.cc
similarity index 100%
rename from plugins/experimental/esi/lib/Variables.cc
rename to plugins/esi/lib/Variables.cc
diff --git a/plugins/experimental/esi/lib/Variables.h b/plugins/esi/lib/Variables.h
similarity index 100%
rename from plugins/experimental/esi/lib/Variables.h
rename to plugins/esi/lib/Variables.h
diff --git a/plugins/experimental/esi/lib/gzip.cc b/plugins/esi/lib/gzip.cc
similarity index 100%
rename from plugins/experimental/esi/lib/gzip.cc
rename to plugins/esi/lib/gzip.cc
diff --git a/plugins/experimental/esi/lib/gzip.h b/plugins/esi/lib/gzip.h
similarity index 100%
rename from plugins/experimental/esi/lib/gzip.h
rename to plugins/esi/lib/gzip.h
diff --git a/plugins/experimental/esi/serverIntercept.cc b/plugins/esi/serverIntercept.cc
similarity index 100%
rename from plugins/experimental/esi/serverIntercept.cc
rename to plugins/esi/serverIntercept.cc
diff --git a/plugins/experimental/esi/serverIntercept.h b/plugins/esi/serverIntercept.h
similarity index 100%
rename from plugins/experimental/esi/serverIntercept.h
rename to plugins/esi/serverIntercept.h
diff --git a/plugins/experimental/esi/test/HandlerMap.cc b/plugins/esi/test/HandlerMap.cc
similarity index 100%
rename from plugins/experimental/esi/test/HandlerMap.cc
rename to plugins/esi/test/HandlerMap.cc
diff --git a/plugins/experimental/esi/test/HandlerMap.h b/plugins/esi/test/HandlerMap.h
similarity index 100%
rename from plugins/experimental/esi/test/HandlerMap.h
rename to plugins/esi/test/HandlerMap.h
diff --git a/plugins/experimental/esi/test/StubIncludeHandler.cc b/plugins/esi/test/StubIncludeHandler.cc
similarity index 100%
rename from plugins/experimental/esi/test/StubIncludeHandler.cc
rename to plugins/esi/test/StubIncludeHandler.cc
diff --git a/plugins/experimental/esi/test/StubIncludeHandler.h b/plugins/esi/test/StubIncludeHandler.h
similarity index 100%
rename from plugins/experimental/esi/test/StubIncludeHandler.h
rename to plugins/esi/test/StubIncludeHandler.h
diff --git a/plugins/experimental/esi/test/TestHandlerManager.cc b/plugins/esi/test/TestHandlerManager.cc
similarity index 100%
rename from plugins/experimental/esi/test/TestHandlerManager.cc
rename to plugins/esi/test/TestHandlerManager.cc
diff --git a/plugins/experimental/esi/test/TestHttpDataFetcher.h b/plugins/esi/test/TestHttpDataFetcher.h
similarity index 100%
rename from plugins/experimental/esi/test/TestHttpDataFetcher.h
rename to plugins/esi/test/TestHttpDataFetcher.h
diff --git a/plugins/experimental/esi/test/docnode_test.cc b/plugins/esi/test/docnode_test.cc
similarity index 100%
rename from plugins/experimental/esi/test/docnode_test.cc
rename to plugins/esi/test/docnode_test.cc
diff --git a/plugins/experimental/esi/test/gzip_test.cc b/plugins/esi/test/gzip_test.cc
similarity index 100%
rename from plugins/experimental/esi/test/gzip_test.cc
rename to plugins/esi/test/gzip_test.cc
diff --git a/plugins/experimental/esi/test/parser_test.cc b/plugins/esi/test/parser_test.cc
similarity index 100%
rename from plugins/experimental/esi/test/parser_test.cc
rename to plugins/esi/test/parser_test.cc
diff --git a/plugins/experimental/esi/test/print_funcs.cc b/plugins/esi/test/print_funcs.cc
similarity index 100%
rename from plugins/experimental/esi/test/print_funcs.cc
rename to plugins/esi/test/print_funcs.cc
diff --git a/plugins/experimental/esi/test/print_funcs.h b/plugins/esi/test/print_funcs.h
similarity index 100%
rename from plugins/experimental/esi/test/print_funcs.h
rename to plugins/esi/test/print_funcs.h
diff --git a/plugins/experimental/esi/test/processor_test.cc b/plugins/esi/test/processor_test.cc
similarity index 100%
rename from plugins/experimental/esi/test/processor_test.cc
rename to plugins/esi/test/processor_test.cc
diff --git a/plugins/experimental/esi/test/sampleProb.cc b/plugins/esi/test/sampleProb.cc
similarity index 100%
rename from plugins/experimental/esi/test/sampleProb.cc
rename to plugins/esi/test/sampleProb.cc
diff --git a/plugins/experimental/esi/test/utils_test.cc b/plugins/esi/test/utils_test.cc
similarity index 100%
rename from plugins/experimental/esi/test/utils_test.cc
rename to plugins/esi/test/utils_test.cc
diff --git a/plugins/experimental/esi/test/vars_test.cc b/plugins/esi/test/vars_test.cc
similarity index 100%
rename from plugins/experimental/esi/test/vars_test.cc
rename to plugins/esi/test/vars_test.cc
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index 2d8a02f13ea..2bcd4b43564 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -16,8 +16,6 @@
 
 SUBDIRS = \
  acme \
- authproxy \
- background_fetch \
  balancer \
  buffer_upload \
  cache_promote \
@@ -28,8 +26,6 @@ SUBDIRS = \
  custom_redirect \
  epic \
  escalate \
- esi \
- generator \
  geoip_acl \
  header_normalize \
  hipes \
@@ -39,17 +35,14 @@ SUBDIRS = \
  metalink \
  mp4 \
  multiplexer \
- regex_revalidate \
  remap_stats \
  remap_purge \
- s3_auth \
  ssl_cert_loader \
  sslheaders \
  stale_while_revalidate \
  stream_editor \
  ts_lua \
- url_sig \
- xdebug
+ url_sig
 
 if ENABLE_CPPAPI
 if BUILD_WEBP_TRANSFORM_PLUGIN
diff --git a/plugins/experimental/generator/Makefile.am b/plugins/generator/Makefile.am
similarity index 100%
rename from plugins/experimental/generator/Makefile.am
rename to plugins/generator/Makefile.am
diff --git a/plugins/experimental/generator/generator.cc b/plugins/generator/generator.cc
similarity index 100%
rename from plugins/experimental/generator/generator.cc
rename to plugins/generator/generator.cc
diff --git a/plugins/experimental/regex_revalidate/Makefile.am b/plugins/regex_revalidate/Makefile.am
similarity index 100%
rename from plugins/experimental/regex_revalidate/Makefile.am
rename to plugins/regex_revalidate/Makefile.am
diff --git a/plugins/experimental/regex_revalidate/regex_revalidate.c b/plugins/regex_revalidate/regex_revalidate.c
similarity index 100%
rename from plugins/experimental/regex_revalidate/regex_revalidate.c
rename to plugins/regex_revalidate/regex_revalidate.c
diff --git a/plugins/experimental/s3_auth/Makefile.am b/plugins/s3_auth/Makefile.am
similarity index 100%
rename from plugins/experimental/s3_auth/Makefile.am
rename to plugins/s3_auth/Makefile.am
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
similarity index 100%
rename from plugins/experimental/s3_auth/s3_auth.cc
rename to plugins/s3_auth/s3_auth.cc
diff --git a/plugins/experimental/xdebug/Makefile.am b/plugins/xdebug/Makefile.am
similarity index 100%
rename from plugins/experimental/xdebug/Makefile.am
rename to plugins/xdebug/Makefile.am
diff --git a/plugins/experimental/xdebug/xdebug.cc b/plugins/xdebug/xdebug.cc
similarity index 100%
rename from plugins/experimental/xdebug/xdebug.cc
rename to plugins/xdebug/xdebug.cc