diff --git a/build.gradle b/build.gradle
index 97186e5..c8f75b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,31 +1,34 @@
 plugins {
-    id 'java-library'
+    id 'maven-publish'
+    id 'net.woggioni.plugins.multi-release-jar'
+    id 'net.woggioni.gradle.lombok'
 }
 
 group = "net.woggioni"
 
 repositories {
-    mavenLocal()
     mavenCentral()
-    jcenter()
+    maven {
+        url = 'https://mvn.woggioni.net/'
+    }
+}
+
+lombok {
+    version = getProperty('lombok.version')
 }
 
 dependencies {
-    compileOnly group: "org.projectlombok", name: "lombok", version: lombokVersion
-    annotationProcessor group: "org.projectlombok", name: "lombok", version: lombokVersion
+    implementation group: 'net.woggioni', name: 'jwo', version: getProperty('jwo.version')
 
-    implementation group: 'net.woggioni', name: 'jwo', version: jwoVersion
-
-    testCompileOnly group: "org.projectlombok", name: "lombok", version: lombokVersion
-    testAnnotationProcessor group: "org.projectlombok", name: "lombok", version: lombokVersion
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
-    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junit.jupiter.version')
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('junit.jupiter.version')
 }
 
 java {
-    modularity.inferModulePath = true
     sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_11
+    withJavadocJar()
+    withSourcesJar()
 }
 
 compileTestJava {
@@ -36,3 +39,20 @@ test {
     useJUnitPlatform()
 }
 
+publishing {
+    repositories {
+        maven {
+            url = 'https://mvn.woggioni.net/'
+        }
+    }
+    publications {
+        maven(MavenPublication) {
+            from(components["java"])
+        }
+    }
+}
+
+wrapper {
+    distributionType = Wrapper.DistributionType.BIN
+    gradleVersion = getProperty('gradle.version')
+}
diff --git a/gradle.properties b/gradle.properties
index 9b01c77..724efa9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
-jwoVersion=1.0
-junitJupiterVersion=5.7.0
-lombokVersion=1.18.16
-slf4jVersion=1.7.30
\ No newline at end of file
+gradle.version = 7.1.1
+jwo.version=1.0
+junit.jupiter.version=5.7.2
+lombok.version=1.18.16
+slf4j.version=1.7.32
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 28ff446..05679dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..744e882 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/settings.gradle b/settings.gradle
index 3da4e94..0d4560d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,16 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        maven {
+            url = 'https://woggioni.net/mvn/'
+        }
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id "net.woggioni.gradle.lombok" version "0.1"
+        id "net.woggioni.plugins.multi-release-jar" version "0.1"
+    }
+}
+
 rootProject.name = 'wdi'
diff --git a/src/main/java/net/woggioni/wdi/api/Bean.java b/src/main/java/net/woggioni/wdi/Bean.java
similarity index 93%
rename from src/main/java/net/woggioni/wdi/api/Bean.java
rename to src/main/java/net/woggioni/wdi/Bean.java
index 2757033..3eae570 100644
--- a/src/main/java/net/woggioni/wdi/api/Bean.java
+++ b/src/main/java/net/woggioni/wdi/Bean.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/net/woggioni/wdi/api/BeanClasses.java b/src/main/java/net/woggioni/wdi/BeanClasses.java
similarity index 90%
rename from src/main/java/net/woggioni/wdi/api/BeanClasses.java
rename to src/main/java/net/woggioni/wdi/BeanClasses.java
index a8050cc..7da9805 100644
--- a/src/main/java/net/woggioni/wdi/api/BeanClasses.java
+++ b/src/main/java/net/woggioni/wdi/BeanClasses.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/net/woggioni/wdi/api/BeanConfigurationException.java b/src/main/java/net/woggioni/wdi/BeanConfigurationException.java
similarity index 89%
rename from src/main/java/net/woggioni/wdi/api/BeanConfigurationException.java
rename to src/main/java/net/woggioni/wdi/BeanConfigurationException.java
index 4a9c735..4927c32 100644
--- a/src/main/java/net/woggioni/wdi/api/BeanConfigurationException.java
+++ b/src/main/java/net/woggioni/wdi/BeanConfigurationException.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 public class BeanConfigurationException extends RuntimeException {
     public BeanConfigurationException(String msg) {
diff --git a/src/main/java/net/woggioni/wdi/api/BeanContainer.java b/src/main/java/net/woggioni/wdi/BeanContainer.java
similarity index 99%
rename from src/main/java/net/woggioni/wdi/api/BeanContainer.java
rename to src/main/java/net/woggioni/wdi/BeanContainer.java
index dc5478c..773a28c 100644
--- a/src/main/java/net/woggioni/wdi/api/BeanContainer.java
+++ b/src/main/java/net/woggioni/wdi/BeanContainer.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/net/woggioni/wdi/api/BeanFactory.java b/src/main/java/net/woggioni/wdi/BeanFactory.java
similarity index 83%
rename from src/main/java/net/woggioni/wdi/api/BeanFactory.java
rename to src/main/java/net/woggioni/wdi/BeanFactory.java
index 7f9eaaa..fa85e2d 100644
--- a/src/main/java/net/woggioni/wdi/api/BeanFactory.java
+++ b/src/main/java/net/woggioni/wdi/BeanFactory.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.util.Collections;
 
diff --git a/src/main/java/net/woggioni/wdi/api/BeanSpec.java b/src/main/java/net/woggioni/wdi/BeanSpec.java
similarity index 98%
rename from src/main/java/net/woggioni/wdi/api/BeanSpec.java
rename to src/main/java/net/woggioni/wdi/BeanSpec.java
index 161dac1..e96a55b 100644
--- a/src/main/java/net/woggioni/wdi/api/BeanSpec.java
+++ b/src/main/java/net/woggioni/wdi/BeanSpec.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/net/woggioni/wdi/api/Import.java b/src/main/java/net/woggioni/wdi/Import.java
similarity index 91%
rename from src/main/java/net/woggioni/wdi/api/Import.java
rename to src/main/java/net/woggioni/wdi/Import.java
index 6bdf443..ba710e5 100644
--- a/src/main/java/net/woggioni/wdi/api/Import.java
+++ b/src/main/java/net/woggioni/wdi/Import.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/net/woggioni/wdi/api/ParentIterator.java b/src/main/java/net/woggioni/wdi/ParentIterator.java
similarity index 91%
rename from src/main/java/net/woggioni/wdi/api/ParentIterator.java
rename to src/main/java/net/woggioni/wdi/ParentIterator.java
index 2f0ef82..1782f73 100644
--- a/src/main/java/net/woggioni/wdi/api/ParentIterator.java
+++ b/src/main/java/net/woggioni/wdi/ParentIterator.java
@@ -1,9 +1,12 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 import net.woggioni.jwo.JWO;
 
-import java.util.*;
-
 class ParentIterator implements Iterator<Class<?>> {
 
     static Class<?>[] superClasses(Class<?> cls) {
diff --git a/src/main/java/net/woggioni/wdi/api/Qualifier.java b/src/main/java/net/woggioni/wdi/Qualifier.java
similarity index 90%
rename from src/main/java/net/woggioni/wdi/api/Qualifier.java
rename to src/main/java/net/woggioni/wdi/Qualifier.java
index 5f3bc44..42cb4bf 100644
--- a/src/main/java/net/woggioni/wdi/api/Qualifier.java
+++ b/src/main/java/net/woggioni/wdi/Qualifier.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/net/woggioni/wdi/api/Startup.java b/src/main/java/net/woggioni/wdi/Startup.java
similarity index 89%
rename from src/main/java/net/woggioni/wdi/api/Startup.java
rename to src/main/java/net/woggioni/wdi/Startup.java
index 597a243..3fce3c5 100644
--- a/src/main/java/net/woggioni/wdi/api/Startup.java
+++ b/src/main/java/net/woggioni/wdi/Startup.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
new file mode 100644
index 0000000..b2104a8
--- /dev/null
+++ b/src/main/java9/module-info.java
@@ -0,0 +1,3 @@
+module net.woggioni.wdi {
+    exports net.woggioni.wdi;
+}
\ No newline at end of file
diff --git a/src/test/java/net/woggioni/wdi/api/BeanContainerTest.java b/src/test/java/net/woggioni/wdi/BeanContainerTest.java
similarity index 99%
rename from src/test/java/net/woggioni/wdi/api/BeanContainerTest.java
rename to src/test/java/net/woggioni/wdi/BeanContainerTest.java
index 98a6b75..45cfc03 100644
--- a/src/test/java/net/woggioni/wdi/api/BeanContainerTest.java
+++ b/src/test/java/net/woggioni/wdi/BeanContainerTest.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/src/test/java/net/woggioni/wdi/api/ParentIteratorTest.java b/src/test/java/net/woggioni/wdi/ParentIteratorTest.java
similarity index 96%
rename from src/test/java/net/woggioni/wdi/api/ParentIteratorTest.java
rename to src/test/java/net/woggioni/wdi/ParentIteratorTest.java
index 4f69bb8..2a2cdb9 100644
--- a/src/test/java/net/woggioni/wdi/api/ParentIteratorTest.java
+++ b/src/test/java/net/woggioni/wdi/ParentIteratorTest.java
@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import net.woggioni.jwo.CollectionUtils;
 import net.woggioni.jwo.JWO;