diff --git a/attachments/kong/handler.lua b/attachments/kong/plugins/open-appsec-waf-kong-plugin/handler.lua
similarity index 100%
rename from attachments/kong/handler.lua
rename to attachments/kong/plugins/open-appsec-waf-kong-plugin/handler.lua
diff --git a/attachments/kong/lua_attachment_wrapper.c b/attachments/kong/plugins/open-appsec-waf-kong-plugin/lua_attachment_wrapper.c
similarity index 100%
rename from attachments/kong/lua_attachment_wrapper.c
rename to attachments/kong/plugins/open-appsec-waf-kong-plugin/lua_attachment_wrapper.c
diff --git a/attachments/kong/nano_ffi.lua b/attachments/kong/plugins/open-appsec-waf-kong-plugin/nano_ffi.lua
similarity index 100%
rename from attachments/kong/nano_ffi.lua
rename to attachments/kong/plugins/open-appsec-waf-kong-plugin/nano_ffi.lua
diff --git a/attachments/kong/open-appsec-waf-kong-plugin-1.0.0-1.rockspec b/attachments/kong/plugins/open-appsec-waf-kong-plugin/open-appsec-waf-kong-plugin-1.0.0-1.rockspec
similarity index 84%
rename from attachments/kong/open-appsec-waf-kong-plugin-1.0.0-1.rockspec
rename to attachments/kong/plugins/open-appsec-waf-kong-plugin/open-appsec-waf-kong-plugin-1.0.0-1.rockspec
index 3f93774..7a9ae1d 100755
--- a/attachments/kong/open-appsec-waf-kong-plugin-1.0.0-1.rockspec
+++ b/attachments/kong/plugins/open-appsec-waf-kong-plugin/open-appsec-waf-kong-plugin-1.0.0-1.rockspec
@@ -23,12 +23,12 @@ build = {
   type = "builtin",
 
   modules = {
-    ["kong.plugins.open-appsec-waf-kong-plugin.handler"] = "attachments/kong/handler.lua",
-    ["kong.plugins.open-appsec-waf-kong-plugin.nano_ffi"] = "attachments/kong/nano_ffi.lua",
-    ["kong.plugins.open-appsec-waf-kong-plugin.schema"] = "attachments/kong/schema.lua",
+    ["kong.plugins.open-appsec-waf-kong-plugin.handler"] = "attachments/kong/plugins/open-appsec-waf-kong-plugin/handler.lua",
+    ["kong.plugins.open-appsec-waf-kong-plugin.nano_ffi"] = "attachments/kong/plugins/open-appsec-waf-kong-plugin/nano_ffi.lua",
+    ["kong.plugins.open-appsec-waf-kong-plugin.schema"] = "attachments/kong/plugins/open-appsec-waf-kong-plugin/schema.lua",
     ["lua_attachment_wrapper"] = {
       sources = {
-        "attachments/kong/lua_attachment_wrapper.c",
+        "attachments/kong/plugins/open-appsec-waf-kong-plugin/lua_attachment_wrapper.c",
         "attachments/nano_attachment/nano_attachment.c",
         "attachments/nano_attachment/nano_attachment_io.c",
         "attachments/nano_attachment/nano_attachment_metric.c",
diff --git a/attachments/kong/schema.lua b/attachments/kong/plugins/open-appsec-waf-kong-plugin/schema.lua
similarity index 100%
rename from attachments/kong/schema.lua
rename to attachments/kong/plugins/open-appsec-waf-kong-plugin/schema.lua