diff --git a/spec/01-unit/000-new-dao/01-schema/01-schema_spec.lua b/spec/01-unit/01-db/01-schema/01-schema_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/01-schema_spec.lua
rename to spec/01-unit/01-db/01-schema/01-schema_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/02-metaschema_spec.lua b/spec/01-unit/01-db/01-schema/02-metaschema_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/02-metaschema_spec.lua
rename to spec/01-unit/01-db/01-schema/02-metaschema_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/03-typedefs_spec.lua b/spec/01-unit/01-db/01-schema/03-typedefs_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/03-typedefs_spec.lua
rename to spec/01-unit/01-db/01-schema/03-typedefs_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/06-entities_schema_spec.lua b/spec/01-unit/01-db/01-schema/04-entities_schema_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/06-entities_schema_spec.lua
rename to spec/01-unit/01-db/01-schema/04-entities_schema_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/04-services_spec.lua b/spec/01-unit/01-db/01-schema/05-services_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/04-services_spec.lua
rename to spec/01-unit/01-db/01-schema/05-services_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/05-routes_spec.lua b/spec/01-unit/01-db/01-schema/06-routes_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/05-routes_spec.lua
rename to spec/01-unit/01-db/01-schema/06-routes_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/06-plugins_spec.lua b/spec/01-unit/01-db/01-schema/07-plugins_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/06-plugins_spec.lua
rename to spec/01-unit/01-db/01-schema/07-plugins_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/07-targets_spec.lua b/spec/01-unit/01-db/01-schema/08-targets_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/07-targets_spec.lua
rename to spec/01-unit/01-db/01-schema/08-targets_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/08-upstreams_spec.lua b/spec/01-unit/01-db/01-schema/09-upstreams_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/08-upstreams_spec.lua
rename to spec/01-unit/01-db/01-schema/09-upstreams_spec.lua
diff --git a/spec/01-unit/000-new-dao/01-schema/07-migrations_spec.lua b/spec/01-unit/01-db/01-schema/10-migrations_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/01-schema/07-migrations_spec.lua
rename to spec/01-unit/01-db/01-schema/10-migrations_spec.lua
diff --git a/spec/01-unit/000-new-dao/02-db-errors_spec.lua b/spec/01-unit/01-db/02-db-errors_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/02-db-errors_spec.lua
rename to spec/01-unit/01-db/02-db-errors_spec.lua
diff --git a/spec/01-unit/000-new-dao/03-arguments_spec.lua b/spec/01-unit/01-db/03-arguments_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/03-arguments_spec.lua
rename to spec/01-unit/01-db/03-arguments_spec.lua
diff --git a/spec/01-unit/000-new-dao/04-dao.lua b/spec/01-unit/01-db/04-dao.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/04-dao.lua
rename to spec/01-unit/01-db/04-dao.lua
diff --git a/spec/01-unit/000-new-dao/05-cassandra_spec.lua b/spec/01-unit/01-db/05-cassandra_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/05-cassandra_spec.lua
rename to spec/01-unit/01-db/05-cassandra_spec.lua
diff --git a/spec/01-unit/000-new-dao/06-postgres_spec.lua b/spec/01-unit/01-db/06-postgres_spec.lua
similarity index 100%
rename from spec/01-unit/000-new-dao/06-postgres_spec.lua
rename to spec/01-unit/01-db/06-postgres_spec.lua
diff --git a/spec/01-unit/001-rockspec_meta_spec.lua b/spec/01-unit/02-rockspec_meta_spec.lua
similarity index 100%
rename from spec/01-unit/001-rockspec_meta_spec.lua
rename to spec/01-unit/02-rockspec_meta_spec.lua
diff --git a/spec/01-unit/002-conf_loader_spec.lua b/spec/01-unit/03-conf_loader_spec.lua
similarity index 100%
rename from spec/01-unit/002-conf_loader_spec.lua
rename to spec/01-unit/03-conf_loader_spec.lua
diff --git a/spec/01-unit/003-prefix_handler_spec.lua b/spec/01-unit/04-prefix_handler_spec.lua
similarity index 100%
rename from spec/01-unit/003-prefix_handler_spec.lua
rename to spec/01-unit/04-prefix_handler_spec.lua
diff --git a/spec/01-unit/004-utils_spec.lua b/spec/01-unit/05-utils_spec.lua
similarity index 100%
rename from spec/01-unit/004-utils_spec.lua
rename to spec/01-unit/05-utils_spec.lua
diff --git a/spec/01-unit/005-timestamp_spec.lua b/spec/01-unit/06-timestamp_spec.lua
similarity index 100%
rename from spec/01-unit/005-timestamp_spec.lua
rename to spec/01-unit/06-timestamp_spec.lua
diff --git a/spec/01-unit/008-api_helpers_spec.lua b/spec/01-unit/07-api_helpers_spec.lua
similarity index 100%
rename from spec/01-unit/008-api_helpers_spec.lua
rename to spec/01-unit/07-api_helpers_spec.lua
diff --git a/spec/01-unit/010-router_spec.lua b/spec/01-unit/08-router_spec.lua
similarity index 100%
rename from spec/01-unit/010-router_spec.lua
rename to spec/01-unit/08-router_spec.lua
diff --git a/spec/01-unit/011-balancer_spec.lua b/spec/01-unit/09-balancer_spec.lua
similarity index 100%
rename from spec/01-unit/011-balancer_spec.lua
rename to spec/01-unit/09-balancer_spec.lua
diff --git a/spec/01-unit/012-log_serializer_spec.lua b/spec/01-unit/10-log_serializer_spec.lua
similarity index 100%
rename from spec/01-unit/012-log_serializer_spec.lua
rename to spec/01-unit/10-log_serializer_spec.lua
diff --git a/spec/01-unit/013-reports_spec.lua b/spec/01-unit/11-reports_spec.lua
similarity index 100%
rename from spec/01-unit/013-reports_spec.lua
rename to spec/01-unit/11-reports_spec.lua
diff --git a/spec/01-unit/014-plugins_order_spec.lua b/spec/01-unit/12-plugins_order_spec.lua
similarity index 100%
rename from spec/01-unit/014-plugins_order_spec.lua
rename to spec/01-unit/12-plugins_order_spec.lua
diff --git a/spec/01-unit/015-plugins_version_spec.lua b/spec/01-unit/13-plugins_version_spec.lua
similarity index 100%
rename from spec/01-unit/015-plugins_version_spec.lua
rename to spec/01-unit/13-plugins_version_spec.lua
diff --git a/spec/01-unit/016-dns_spec.lua b/spec/01-unit/14-dns_spec.lua
similarity index 100%
rename from spec/01-unit/016-dns_spec.lua
rename to spec/01-unit/14-dns_spec.lua
diff --git a/spec/01-unit/017-tools_cluster_ca_spec.lua b/spec/01-unit/15-tools_cluster_ca_spec.lua
similarity index 100%
rename from spec/01-unit/017-tools_cluster_ca_spec.lua
rename to spec/01-unit/15-tools_cluster_ca_spec.lua
diff --git a/spec/01-unit/018-runloop_handler_spec.lua b/spec/01-unit/16-runloop_handler_spec.lua
similarity index 100%
rename from spec/01-unit/018-runloop_handler_spec.lua
rename to spec/01-unit/16-runloop_handler_spec.lua
diff --git a/spec/02-integration/01-helpers/00-helpers_spec.lua b/spec/02-integration/01-helpers/01-helpers_spec.lua
similarity index 100%
rename from spec/02-integration/01-helpers/00-helpers_spec.lua
rename to spec/02-integration/01-helpers/01-helpers_spec.lua
diff --git a/spec/02-integration/01-helpers/01-blueprints_spec.lua b/spec/02-integration/01-helpers/02-blueprints_spec.lua
similarity index 100%
rename from spec/02-integration/01-helpers/01-blueprints_spec.lua
rename to spec/02-integration/01-helpers/02-blueprints_spec.lua
diff --git a/spec/02-integration/000-new-dao/01-db_spec.lua b/spec/02-integration/03-db/01-db_spec.lua
similarity index 100%
rename from spec/02-integration/000-new-dao/01-db_spec.lua
rename to spec/02-integration/03-db/01-db_spec.lua
diff --git a/spec/02-integration/000-new-dao/02-db_core_entities_spec.lua b/spec/02-integration/03-db/02-db_core_entities_spec.lua
similarity index 100%
rename from spec/02-integration/000-new-dao/02-db_core_entities_spec.lua
rename to spec/02-integration/03-db/02-db_core_entities_spec.lua
diff --git a/spec/02-integration/000-new-dao/03-plugins_spec.lua b/spec/02-integration/03-db/03-plugins_spec.lua
similarity index 100%
rename from spec/02-integration/000-new-dao/03-plugins_spec.lua
rename to spec/02-integration/03-db/03-plugins_spec.lua
diff --git a/spec/02-integration/000-new-dao/03-db_cluster_mutex_spec.lua b/spec/02-integration/03-db/04-db_cluster_mutex_spec.lua
similarity index 100%
rename from spec/02-integration/000-new-dao/03-db_cluster_mutex_spec.lua
rename to spec/02-integration/03-db/04-db_cluster_mutex_spec.lua
diff --git a/spec/02-integration/000-new-dao/03-db_cluster_ca_spec.lua b/spec/02-integration/03-db/05-db_cluster_ca_spec.lua
similarity index 100%
rename from spec/02-integration/000-new-dao/03-db_cluster_ca_spec.lua
rename to spec/02-integration/03-db/05-db_cluster_ca_spec.lua
diff --git a/spec/02-integration/04-admin_api/00-admin_api_spec.lua b/spec/02-integration/04-admin_api/01-admin_api_spec.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/00-admin_api_spec.lua
rename to spec/02-integration/04-admin_api/01-admin_api_spec.lua
diff --git a/spec/02-integration/04-admin_api/01-kong_routes_spec.lua b/spec/02-integration/04-admin_api/02-kong_routes_spec.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/01-kong_routes_spec.lua
rename to spec/02-integration/04-admin_api/02-kong_routes_spec.lua
diff --git a/spec/02-integration/04-admin_api/20-routes_routes_spec.lua b/spec/02-integration/04-admin_api/09-routes_routes_spec.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/20-routes_routes_spec.lua
rename to spec/02-integration/04-admin_api/09-routes_routes_spec.lua
diff --git a/spec/02-integration/04-admin_api/21-services_routes_spec.lua b/spec/02-integration/04-admin_api/10-services_routes_spec.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/21-services_routes_spec.lua
rename to spec/02-integration/04-admin_api/10-services_routes_spec.lua
diff --git a/spec/02-integration/04-admin_api/22-reports_spec.lua b/spec/02-integration/04-admin_api/11-reports_spec.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/22-reports_spec.lua
rename to spec/02-integration/04-admin_api/11-reports_spec.lua
diff --git a/spec/02-integration/04-admin_api/24-plugins-conf.lua b/spec/02-integration/04-admin_api/12-plugins-conf.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/24-plugins-conf.lua
rename to spec/02-integration/04-admin_api/12-plugins-conf.lua
diff --git a/spec/02-integration/04-admin_api/25-plugin-endpoints.lua b/spec/02-integration/04-admin_api/13-plugin-endpoints.lua
similarity index 100%
rename from spec/02-integration/04-admin_api/25-plugin-endpoints.lua
rename to spec/02-integration/04-admin_api/13-plugin-endpoints.lua
diff --git a/spec/02-integration/05-proxy/00-proxy_spec.lua b/spec/02-integration/05-proxy/01-proxy_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/00-proxy_spec.lua
rename to spec/02-integration/05-proxy/01-proxy_spec.lua
diff --git a/spec/02-integration/05-proxy/01-router_spec.lua b/spec/02-integration/05-proxy/02-router_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/01-router_spec.lua
rename to spec/02-integration/05-proxy/02-router_spec.lua
diff --git a/spec/02-integration/05-proxy/02-upstream_headers_spec.lua b/spec/02-integration/05-proxy/03-upstream_headers_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/02-upstream_headers_spec.lua
rename to spec/02-integration/05-proxy/03-upstream_headers_spec.lua
diff --git a/spec/02-integration/05-proxy/03-plugins_triggering_spec.lua b/spec/02-integration/05-proxy/04-plugins_triggering_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/03-plugins_triggering_spec.lua
rename to spec/02-integration/05-proxy/04-plugins_triggering_spec.lua
diff --git a/spec/02-integration/05-proxy/04-dns_spec.lua b/spec/02-integration/05-proxy/05-dns_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/04-dns_spec.lua
rename to spec/02-integration/05-proxy/05-dns_spec.lua
diff --git a/spec/02-integration/05-proxy/05-ssl_spec.lua b/spec/02-integration/05-proxy/06-ssl_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/05-ssl_spec.lua
rename to spec/02-integration/05-proxy/06-ssl_spec.lua
diff --git a/spec/02-integration/05-proxy/06-upstream_timeouts_spec.lua b/spec/02-integration/05-proxy/07-upstream_timeouts_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/06-upstream_timeouts_spec.lua
rename to spec/02-integration/05-proxy/07-upstream_timeouts_spec.lua
diff --git a/spec/02-integration/05-proxy/07-uri_encoding_spec.lua b/spec/02-integration/05-proxy/08-uri_encoding_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/07-uri_encoding_spec.lua
rename to spec/02-integration/05-proxy/08-uri_encoding_spec.lua
diff --git a/spec/02-integration/05-proxy/08-websockets_spec.lua b/spec/02-integration/05-proxy/09-websockets_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/08-websockets_spec.lua
rename to spec/02-integration/05-proxy/09-websockets_spec.lua
diff --git a/spec/02-integration/05-proxy/09-balancer_spec.lua b/spec/02-integration/05-proxy/10-balancer_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/09-balancer_spec.lua
rename to spec/02-integration/05-proxy/10-balancer_spec.lua
diff --git a/spec/02-integration/05-proxy/10-handler_spec.lua b/spec/02-integration/05-proxy/11-handler_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/10-handler_spec.lua
rename to spec/02-integration/05-proxy/11-handler_spec.lua
diff --git a/spec/02-integration/05-proxy/11-error_default_type_spec.lua b/spec/02-integration/05-proxy/12-error_default_type_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/11-error_default_type_spec.lua
rename to spec/02-integration/05-proxy/12-error_default_type_spec.lua
diff --git a/spec/02-integration/05-proxy/12-error_handlers_spec.lua b/spec/02-integration/05-proxy/13-error_handlers_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/12-error_handlers_spec.lua
rename to spec/02-integration/05-proxy/13-error_handlers_spec.lua
diff --git a/spec/02-integration/05-proxy/13-server_tokens_spec.lua b/spec/02-integration/05-proxy/14-server_tokens_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/13-server_tokens_spec.lua
rename to spec/02-integration/05-proxy/14-server_tokens_spec.lua
diff --git a/spec/02-integration/05-proxy/14-upstream-status-header_spec.lua b/spec/02-integration/05-proxy/15-upstream-status-header_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/14-upstream-status-header_spec.lua
rename to spec/02-integration/05-proxy/15-upstream-status-header_spec.lua
diff --git a/spec/02-integration/05-proxy/15-custom_nginx_directive_spec.lua b/spec/02-integration/05-proxy/16-custom_nginx_directive_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/15-custom_nginx_directive_spec.lua
rename to spec/02-integration/05-proxy/16-custom_nginx_directive_spec.lua
diff --git a/spec/02-integration/05-proxy/16-origins_spec.lua b/spec/02-integration/05-proxy/17-origins_spec.lua
similarity index 100%
rename from spec/02-integration/05-proxy/16-origins_spec.lua
rename to spec/02-integration/05-proxy/17-origins_spec.lua
diff --git a/spec/03-plugins/10-key-auth/01-api_spec.lua b/spec/03-plugins/09-key-auth/01-api_spec.lua
similarity index 100%
rename from spec/03-plugins/10-key-auth/01-api_spec.lua
rename to spec/03-plugins/09-key-auth/01-api_spec.lua
diff --git a/spec/03-plugins/10-key-auth/02-access_spec.lua b/spec/03-plugins/09-key-auth/02-access_spec.lua
similarity index 100%
rename from spec/03-plugins/10-key-auth/02-access_spec.lua
rename to spec/03-plugins/09-key-auth/02-access_spec.lua
diff --git a/spec/03-plugins/10-key-auth/03-invalidations_spec.lua b/spec/03-plugins/09-key-auth/03-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/10-key-auth/03-invalidations_spec.lua
rename to spec/03-plugins/09-key-auth/03-invalidations_spec.lua
diff --git a/spec/03-plugins/11-basic-auth/01-crypto_spec.lua b/spec/03-plugins/10-basic-auth/01-crypto_spec.lua
similarity index 100%
rename from spec/03-plugins/11-basic-auth/01-crypto_spec.lua
rename to spec/03-plugins/10-basic-auth/01-crypto_spec.lua
diff --git a/spec/03-plugins/11-basic-auth/02-api_spec.lua b/spec/03-plugins/10-basic-auth/02-api_spec.lua
similarity index 100%
rename from spec/03-plugins/11-basic-auth/02-api_spec.lua
rename to spec/03-plugins/10-basic-auth/02-api_spec.lua
diff --git a/spec/03-plugins/11-basic-auth/03-access_spec.lua b/spec/03-plugins/10-basic-auth/03-access_spec.lua
similarity index 100%
rename from spec/03-plugins/11-basic-auth/03-access_spec.lua
rename to spec/03-plugins/10-basic-auth/03-access_spec.lua
diff --git a/spec/03-plugins/11-basic-auth/04-invalidations_spec.lua b/spec/03-plugins/10-basic-auth/04-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/11-basic-auth/04-invalidations_spec.lua
rename to spec/03-plugins/10-basic-auth/04-invalidations_spec.lua
diff --git a/spec/03-plugins/12-correlation-id/01-access_spec.lua b/spec/03-plugins/11-correlation-id/01-access_spec.lua
similarity index 100%
rename from spec/03-plugins/12-correlation-id/01-access_spec.lua
rename to spec/03-plugins/11-correlation-id/01-access_spec.lua
diff --git a/spec/03-plugins/13-request-size-limiting/01-access_spec.lua b/spec/03-plugins/12-request-size-limiting/01-access_spec.lua
similarity index 100%
rename from spec/03-plugins/13-request-size-limiting/01-access_spec.lua
rename to spec/03-plugins/12-request-size-limiting/01-access_spec.lua
diff --git a/spec/03-plugins/14-cors/01-access_spec.lua b/spec/03-plugins/13-cors/01-access_spec.lua
similarity index 100%
rename from spec/03-plugins/14-cors/01-access_spec.lua
rename to spec/03-plugins/13-cors/01-access_spec.lua
diff --git a/spec/03-plugins/14-cors/02-schema_spec.lua b/spec/03-plugins/13-cors/02-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/14-cors/02-schema_spec.lua
rename to spec/03-plugins/13-cors/02-schema_spec.lua
diff --git a/spec/03-plugins/15-request-transformer/01-schema_spec.lua b/spec/03-plugins/14-request-transformer/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/15-request-transformer/01-schema_spec.lua
rename to spec/03-plugins/14-request-transformer/01-schema_spec.lua
diff --git a/spec/03-plugins/15-request-transformer/02-access_spec.lua b/spec/03-plugins/14-request-transformer/02-access_spec.lua
similarity index 100%
rename from spec/03-plugins/15-request-transformer/02-access_spec.lua
rename to spec/03-plugins/14-request-transformer/02-access_spec.lua
diff --git a/spec/03-plugins/15-request-transformer/03-api_spec.lua b/spec/03-plugins/14-request-transformer/03-api_spec.lua
similarity index 100%
rename from spec/03-plugins/15-request-transformer/03-api_spec.lua
rename to spec/03-plugins/14-request-transformer/03-api_spec.lua
diff --git a/spec/03-plugins/16-response-transformer/01-header_transformer_spec.lua b/spec/03-plugins/15-response-transformer/01-header_transformer_spec.lua
similarity index 100%
rename from spec/03-plugins/16-response-transformer/01-header_transformer_spec.lua
rename to spec/03-plugins/15-response-transformer/01-header_transformer_spec.lua
diff --git a/spec/03-plugins/16-response-transformer/02-body_transformer_spec.lua b/spec/03-plugins/15-response-transformer/02-body_transformer_spec.lua
similarity index 100%
rename from spec/03-plugins/16-response-transformer/02-body_transformer_spec.lua
rename to spec/03-plugins/15-response-transformer/02-body_transformer_spec.lua
diff --git a/spec/03-plugins/16-response-transformer/03-api_spec.lua b/spec/03-plugins/15-response-transformer/03-api_spec.lua
similarity index 100%
rename from spec/03-plugins/16-response-transformer/03-api_spec.lua
rename to spec/03-plugins/15-response-transformer/03-api_spec.lua
diff --git a/spec/03-plugins/16-response-transformer/04-filter_spec.lua b/spec/03-plugins/15-response-transformer/04-filter_spec.lua
similarity index 100%
rename from spec/03-plugins/16-response-transformer/04-filter_spec.lua
rename to spec/03-plugins/15-response-transformer/04-filter_spec.lua
diff --git a/spec/03-plugins/16-response-transformer/05-big_response_body_spec.lua b/spec/03-plugins/15-response-transformer/05-big_response_body_spec.lua
similarity index 100%
rename from spec/03-plugins/16-response-transformer/05-big_response_body_spec.lua
rename to spec/03-plugins/15-response-transformer/05-big_response_body_spec.lua
diff --git a/spec/03-plugins/17-jwt/01-jwt_parser_spec.lua b/spec/03-plugins/16-jwt/01-jwt_parser_spec.lua
similarity index 99%
rename from spec/03-plugins/17-jwt/01-jwt_parser_spec.lua
rename to spec/03-plugins/16-jwt/01-jwt_parser_spec.lua
index be910e38ac26..06bfade1cca4 100644
--- a/spec/03-plugins/17-jwt/01-jwt_parser_spec.lua
+++ b/spec/03-plugins/16-jwt/01-jwt_parser_spec.lua
@@ -1,5 +1,5 @@
 local jwt_parser = require "kong.plugins.jwt.jwt_parser"
-local fixtures   = require "spec.03-plugins.17-jwt.fixtures"
+local fixtures   = require "spec.03-plugins.16-jwt.fixtures"
 local helpers    = require "spec.helpers"
 
 
diff --git a/spec/03-plugins/17-jwt/02-api_spec.lua b/spec/03-plugins/16-jwt/02-api_spec.lua
similarity index 99%
rename from spec/03-plugins/17-jwt/02-api_spec.lua
rename to spec/03-plugins/16-jwt/02-api_spec.lua
index e0463effd955..8a4f197502a8 100644
--- a/spec/03-plugins/17-jwt/02-api_spec.lua
+++ b/spec/03-plugins/16-jwt/02-api_spec.lua
@@ -1,6 +1,6 @@
 local helpers  = require "spec.helpers"
 local cjson    = require "cjson"
-local fixtures = require "spec.03-plugins.17-jwt.fixtures"
+local fixtures = require "spec.03-plugins.16-jwt.fixtures"
 local utils    = require "kong.tools.utils"
 
 for _, strategy in helpers.each_strategy() do
diff --git a/spec/03-plugins/17-jwt/03-access_spec.lua b/spec/03-plugins/16-jwt/03-access_spec.lua
similarity index 99%
rename from spec/03-plugins/17-jwt/03-access_spec.lua
rename to spec/03-plugins/16-jwt/03-access_spec.lua
index 1b049b1ce802..f047ab8d30ea 100644
--- a/spec/03-plugins/17-jwt/03-access_spec.lua
+++ b/spec/03-plugins/16-jwt/03-access_spec.lua
@@ -1,6 +1,6 @@
 local cjson       = require "cjson"
 local helpers     = require "spec.helpers"
-local fixtures    = require "spec.03-plugins.17-jwt.fixtures"
+local fixtures    = require "spec.03-plugins.16-jwt.fixtures"
 local jwt_encoder = require "kong.plugins.jwt.jwt_parser"
 local utils       = require "kong.tools.utils"
 
diff --git a/spec/03-plugins/17-jwt/04-invalidations_spec.lua b/spec/03-plugins/16-jwt/04-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/17-jwt/04-invalidations_spec.lua
rename to spec/03-plugins/16-jwt/04-invalidations_spec.lua
diff --git a/spec/03-plugins/17-jwt/05-asn_sequence_spec.lua b/spec/03-plugins/16-jwt/05-asn_sequence_spec.lua
similarity index 100%
rename from spec/03-plugins/17-jwt/05-asn_sequence_spec.lua
rename to spec/03-plugins/16-jwt/05-asn_sequence_spec.lua
diff --git a/spec/03-plugins/17-jwt/06-schema_spec.lua b/spec/03-plugins/16-jwt/06-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/17-jwt/06-schema_spec.lua
rename to spec/03-plugins/16-jwt/06-schema_spec.lua
diff --git a/spec/03-plugins/17-jwt/fixtures.lua b/spec/03-plugins/16-jwt/fixtures.lua
similarity index 100%
rename from spec/03-plugins/17-jwt/fixtures.lua
rename to spec/03-plugins/16-jwt/fixtures.lua
diff --git a/spec/03-plugins/18-ip-restriction/01-schema_spec.lua b/spec/03-plugins/17-ip-restriction/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/18-ip-restriction/01-schema_spec.lua
rename to spec/03-plugins/17-ip-restriction/01-schema_spec.lua
diff --git a/spec/03-plugins/18-ip-restriction/02-access_spec.lua b/spec/03-plugins/17-ip-restriction/02-access_spec.lua
similarity index 100%
rename from spec/03-plugins/18-ip-restriction/02-access_spec.lua
rename to spec/03-plugins/17-ip-restriction/02-access_spec.lua
diff --git a/spec/03-plugins/19-acl/01-api_spec.lua b/spec/03-plugins/18-acl/01-api_spec.lua
similarity index 100%
rename from spec/03-plugins/19-acl/01-api_spec.lua
rename to spec/03-plugins/18-acl/01-api_spec.lua
diff --git a/spec/03-plugins/19-acl/02-access_spec.lua b/spec/03-plugins/18-acl/02-access_spec.lua
similarity index 100%
rename from spec/03-plugins/19-acl/02-access_spec.lua
rename to spec/03-plugins/18-acl/02-access_spec.lua
diff --git a/spec/03-plugins/19-acl/03-invalidations_spec.lua b/spec/03-plugins/18-acl/03-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/19-acl/03-invalidations_spec.lua
rename to spec/03-plugins/18-acl/03-invalidations_spec.lua
diff --git a/spec/03-plugins/20-hmac-auth/01-schema_spec.lua b/spec/03-plugins/19-hmac-auth/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/20-hmac-auth/01-schema_spec.lua
rename to spec/03-plugins/19-hmac-auth/01-schema_spec.lua
diff --git a/spec/03-plugins/20-hmac-auth/02-api_spec.lua b/spec/03-plugins/19-hmac-auth/02-api_spec.lua
similarity index 100%
rename from spec/03-plugins/20-hmac-auth/02-api_spec.lua
rename to spec/03-plugins/19-hmac-auth/02-api_spec.lua
diff --git a/spec/03-plugins/20-hmac-auth/03-access_spec.lua b/spec/03-plugins/19-hmac-auth/03-access_spec.lua
similarity index 100%
rename from spec/03-plugins/20-hmac-auth/03-access_spec.lua
rename to spec/03-plugins/19-hmac-auth/03-access_spec.lua
diff --git a/spec/03-plugins/20-hmac-auth/04-invalidations_spec.lua b/spec/03-plugins/19-hmac-auth/04-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/20-hmac-auth/04-invalidations_spec.lua
rename to spec/03-plugins/19-hmac-auth/04-invalidations_spec.lua
diff --git a/spec/03-plugins/21-ldap-auth/01-access_spec.lua b/spec/03-plugins/20-ldap-auth/01-access_spec.lua
similarity index 100%
rename from spec/03-plugins/21-ldap-auth/01-access_spec.lua
rename to spec/03-plugins/20-ldap-auth/01-access_spec.lua
diff --git a/spec/03-plugins/21-ldap-auth/02-invalidations_spec.lua b/spec/03-plugins/20-ldap-auth/02-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/21-ldap-auth/02-invalidations_spec.lua
rename to spec/03-plugins/20-ldap-auth/02-invalidations_spec.lua
diff --git a/spec/03-plugins/22-bot-detection/01-access_spec.lua b/spec/03-plugins/21-bot-detection/01-access_spec.lua
similarity index 100%
rename from spec/03-plugins/22-bot-detection/01-access_spec.lua
rename to spec/03-plugins/21-bot-detection/01-access_spec.lua
diff --git a/spec/03-plugins/22-bot-detection/02-invalidations_spec.lua b/spec/03-plugins/21-bot-detection/02-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/22-bot-detection/02-invalidations_spec.lua
rename to spec/03-plugins/21-bot-detection/02-invalidations_spec.lua
diff --git a/spec/03-plugins/22-bot-detection/03-api_spec.lua b/spec/03-plugins/21-bot-detection/03-api_spec.lua
similarity index 100%
rename from spec/03-plugins/22-bot-detection/03-api_spec.lua
rename to spec/03-plugins/21-bot-detection/03-api_spec.lua
diff --git a/spec/03-plugins/23-aws-lambda/01-access_spec.lua b/spec/03-plugins/22-aws-lambda/01-access_spec.lua
similarity index 100%
rename from spec/03-plugins/23-aws-lambda/01-access_spec.lua
rename to spec/03-plugins/22-aws-lambda/01-access_spec.lua
diff --git a/spec/03-plugins/23-aws-lambda/02-schema_spec.lua b/spec/03-plugins/22-aws-lambda/02-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/23-aws-lambda/02-schema_spec.lua
rename to spec/03-plugins/22-aws-lambda/02-schema_spec.lua
diff --git a/spec/03-plugins/24-rate-limiting/01-schema_spec.lua b/spec/03-plugins/23-rate-limiting/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/24-rate-limiting/01-schema_spec.lua
rename to spec/03-plugins/23-rate-limiting/01-schema_spec.lua
diff --git a/spec/03-plugins/24-rate-limiting/02-policies_spec.lua b/spec/03-plugins/23-rate-limiting/02-policies_spec.lua
similarity index 100%
rename from spec/03-plugins/24-rate-limiting/02-policies_spec.lua
rename to spec/03-plugins/23-rate-limiting/02-policies_spec.lua
diff --git a/spec/03-plugins/24-rate-limiting/03-api_spec.lua b/spec/03-plugins/23-rate-limiting/03-api_spec.lua
similarity index 100%
rename from spec/03-plugins/24-rate-limiting/03-api_spec.lua
rename to spec/03-plugins/23-rate-limiting/03-api_spec.lua
diff --git a/spec/03-plugins/24-rate-limiting/04-access_spec.lua b/spec/03-plugins/23-rate-limiting/04-access_spec.lua
similarity index 100%
rename from spec/03-plugins/24-rate-limiting/04-access_spec.lua
rename to spec/03-plugins/23-rate-limiting/04-access_spec.lua
diff --git a/spec/03-plugins/24-rate-limiting/05-integration_spec.lua b/spec/03-plugins/23-rate-limiting/05-integration_spec.lua
similarity index 100%
rename from spec/03-plugins/24-rate-limiting/05-integration_spec.lua
rename to spec/03-plugins/23-rate-limiting/05-integration_spec.lua
diff --git a/spec/03-plugins/25-response-rate-limiting/01-schema_spec.lua b/spec/03-plugins/24-response-rate-limiting/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/25-response-rate-limiting/01-schema_spec.lua
rename to spec/03-plugins/24-response-rate-limiting/01-schema_spec.lua
diff --git a/spec/03-plugins/25-response-rate-limiting/02-policies_spec.lua b/spec/03-plugins/24-response-rate-limiting/02-policies_spec.lua
similarity index 100%
rename from spec/03-plugins/25-response-rate-limiting/02-policies_spec.lua
rename to spec/03-plugins/24-response-rate-limiting/02-policies_spec.lua
diff --git a/spec/03-plugins/25-response-rate-limiting/03-api_spec.lua b/spec/03-plugins/24-response-rate-limiting/03-api_spec.lua
similarity index 100%
rename from spec/03-plugins/25-response-rate-limiting/03-api_spec.lua
rename to spec/03-plugins/24-response-rate-limiting/03-api_spec.lua
diff --git a/spec/03-plugins/25-response-rate-limiting/04-access_spec.lua b/spec/03-plugins/24-response-rate-limiting/04-access_spec.lua
similarity index 100%
rename from spec/03-plugins/25-response-rate-limiting/04-access_spec.lua
rename to spec/03-plugins/24-response-rate-limiting/04-access_spec.lua
diff --git a/spec/03-plugins/25-response-rate-limiting/05-integration_spec.lua b/spec/03-plugins/24-response-rate-limiting/05-integration_spec.lua
similarity index 100%
rename from spec/03-plugins/25-response-rate-limiting/05-integration_spec.lua
rename to spec/03-plugins/24-response-rate-limiting/05-integration_spec.lua
diff --git a/spec/03-plugins/26-oauth2/01-schema_spec.lua b/spec/03-plugins/25-oauth2/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/26-oauth2/01-schema_spec.lua
rename to spec/03-plugins/25-oauth2/01-schema_spec.lua
diff --git a/spec/03-plugins/26-oauth2/02-api_spec.lua b/spec/03-plugins/25-oauth2/02-api_spec.lua
similarity index 100%
rename from spec/03-plugins/26-oauth2/02-api_spec.lua
rename to spec/03-plugins/25-oauth2/02-api_spec.lua
diff --git a/spec/03-plugins/26-oauth2/03-access_spec.lua b/spec/03-plugins/25-oauth2/03-access_spec.lua
similarity index 100%
rename from spec/03-plugins/26-oauth2/03-access_spec.lua
rename to spec/03-plugins/25-oauth2/03-access_spec.lua
diff --git a/spec/03-plugins/26-oauth2/04-invalidations_spec.lua b/spec/03-plugins/25-oauth2/04-invalidations_spec.lua
similarity index 100%
rename from spec/03-plugins/26-oauth2/04-invalidations_spec.lua
rename to spec/03-plugins/25-oauth2/04-invalidations_spec.lua
diff --git a/spec/03-plugins/27-request-termination/01-schema_spec.lua b/spec/03-plugins/26-request-termination/01-schema_spec.lua
similarity index 100%
rename from spec/03-plugins/27-request-termination/01-schema_spec.lua
rename to spec/03-plugins/26-request-termination/01-schema_spec.lua
diff --git a/spec/03-plugins/27-request-termination/02-access_spec.lua b/spec/03-plugins/26-request-termination/02-access_spec.lua
similarity index 100%
rename from spec/03-plugins/27-request-termination/02-access_spec.lua
rename to spec/03-plugins/26-request-termination/02-access_spec.lua
diff --git a/spec/03-plugins/27-request-termination/03-integration_spec.lua b/spec/03-plugins/26-request-termination/03-integration_spec.lua
similarity index 100%
rename from spec/03-plugins/27-request-termination/03-integration_spec.lua
rename to spec/03-plugins/26-request-termination/03-integration_spec.lua