diff --git a/gradle/01-hello-muni/build.gradle b/gradle-cpp-plugin/01-hello-muni/build.gradle
similarity index 100%
rename from gradle/01-hello-muni/build.gradle
rename to gradle-cpp-plugin/01-hello-muni/build.gradle
diff --git a/gradle/01-hello-muni/src/main/cpp/hellomuni.cpp b/gradle-cpp-plugin/01-hello-muni/src/main/cpp/hellomuni.cpp
similarity index 100%
rename from gradle/01-hello-muni/src/main/cpp/hellomuni.cpp
rename to gradle-cpp-plugin/01-hello-muni/src/main/cpp/hellomuni.cpp
diff --git a/gradle/02-hello-muni-with-gradle-wrapper/build.gradle b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/build.gradle
similarity index 100%
rename from gradle/02-hello-muni-with-gradle-wrapper/build.gradle
rename to gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/build.gradle
diff --git a/gradle/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
rename to gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties
rename to gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/02-hello-muni-with-gradle-wrapper/gradlew b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradlew
similarity index 100%
rename from gradle/02-hello-muni-with-gradle-wrapper/gradlew
rename to gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradlew
diff --git a/gradle/02-hello-muni-with-gradle-wrapper/gradlew.bat b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradlew.bat
similarity index 100%
rename from gradle/02-hello-muni-with-gradle-wrapper/gradlew.bat
rename to gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/gradlew.bat
diff --git a/gradle/02-hello-muni-with-gradle-wrapper/src/main/cpp/hellomuni.cpp b/gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/src/main/cpp/hellomuni.cpp
similarity index 100%
rename from gradle/02-hello-muni-with-gradle-wrapper/src/main/cpp/hellomuni.cpp
rename to gradle-cpp-plugin/02-hello-muni-with-gradle-wrapper/src/main/cpp/hellomuni.cpp
diff --git a/gradle/03-hello-muni-with-debug/build.gradle b/gradle-cpp-plugin/03-hello-muni-with-debug/build.gradle
similarity index 100%
rename from gradle/03-hello-muni-with-debug/build.gradle
rename to gradle-cpp-plugin/03-hello-muni-with-debug/build.gradle
diff --git a/gradle/03-hello-muni-with-debug/src/main/cpp/hellomuni.cpp b/gradle-cpp-plugin/03-hello-muni-with-debug/src/main/cpp/hellomuni.cpp
similarity index 100%
rename from gradle/03-hello-muni-with-debug/src/main/cpp/hellomuni.cpp
rename to gradle-cpp-plugin/03-hello-muni-with-debug/src/main/cpp/hellomuni.cpp
diff --git a/gradle/00-empty-project/build.gradle b/gradle/00-empty-project/build.gradle
new file mode 100644
index 0000000..5cc8c32
--- /dev/null
+++ b/gradle/00-empty-project/build.gradle
@@ -0,0 +1 @@
+// Empty one
diff --git a/gradle/02-c-plugin/build.gradle b/gradle/02-c-plugin/build.gradle
new file mode 100644
index 0000000..931985b
--- /dev/null
+++ b/gradle/02-c-plugin/build.gradle
@@ -0,0 +1,2 @@
+apply plugin: 'c'
+