diff --git a/drone-hugo/Dockerfile b/drone-hugo/Dockerfile
deleted file mode 100644
index d913314..0000000
--- a/drone-hugo/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# GitHub:       https://github.com/gohugoio
-# Twitter:      https://twitter.com/gohugoio
-# Website:      https://gohugo.io/
-
-FROM golang:latest AS build
-
-RUN go install -tags extended github.com/gohugoio/hugo@latest
diff --git a/drone-plugins/drone-hugo/Dockerfile b/drone-plugins/drone-hugo/Dockerfile
new file mode 100644
index 0000000..8806fd5
--- /dev/null
+++ b/drone-plugins/drone-hugo/Dockerfile
@@ -0,0 +1,3 @@
+FROM golang:latest AS build
+
+RUN go install -tags extended github.com/gohugoio/hugo@latest
diff --git a/drone-hugo/build.sh b/drone-plugins/drone-hugo/build.sh
similarity index 100%
rename from drone-hugo/build.sh
rename to drone-plugins/drone-hugo/build.sh
diff --git a/smart-commit/Dockerfile b/drone-plugins/smart-commit/Dockerfile
similarity index 100%
rename from smart-commit/Dockerfile
rename to drone-plugins/smart-commit/Dockerfile
diff --git a/smart-commit/smart-commit b/drone-plugins/smart-commit/smart-commit
similarity index 100%
rename from smart-commit/smart-commit
rename to drone-plugins/smart-commit/smart-commit
diff --git a/smart-commit/smart-commit.sh b/drone-plugins/smart-commit/smart-commit.sh
similarity index 100%
rename from smart-commit/smart-commit.sh
rename to drone-plugins/smart-commit/smart-commit.sh