diff --git a/easysql-plugin-api/pom.xml b/api/pom.xml
similarity index 100%
rename from easysql-plugin-api/pom.xml
rename to api/pom.xml
diff --git a/easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/EasySQLAPI.java b/api/src/main/java/cc/carm/plugin/easysql/EasySQLAPI.java
similarity index 100%
rename from easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/EasySQLAPI.java
rename to api/src/main/java/cc/carm/plugin/easysql/EasySQLAPI.java
diff --git a/easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/api/DBConfiguration.java b/api/src/main/java/cc/carm/plugin/easysql/api/DBConfiguration.java
similarity index 100%
rename from easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/api/DBConfiguration.java
rename to api/src/main/java/cc/carm/plugin/easysql/api/DBConfiguration.java
diff --git a/easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/api/EasySQLRegistry.java b/api/src/main/java/cc/carm/plugin/easysql/api/EasySQLRegistry.java
similarity index 100%
rename from easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/api/EasySQLRegistry.java
rename to api/src/main/java/cc/carm/plugin/easysql/api/EasySQLRegistry.java
diff --git a/easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/api/SQLDriverType.java b/api/src/main/java/cc/carm/plugin/easysql/api/SQLDriverType.java
similarity index 100%
rename from easysql-plugin-api/src/main/java/cc/carm/plugin/easysql/api/SQLDriverType.java
rename to api/src/main/java/cc/carm/plugin/easysql/api/SQLDriverType.java
diff --git a/easysql-plugin-core/pom.xml b/core/pom.xml
similarity index 100%
rename from easysql-plugin-core/pom.xml
rename to core/pom.xml
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java b/core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java
rename to core/src/main/java/cc/carm/plugin/easysql/EasySQLPluginPlatform.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLRegistryImpl.java b/core/src/main/java/cc/carm/plugin/easysql/EasySQLRegistryImpl.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/EasySQLRegistryImpl.java
rename to core/src/main/java/cc/carm/plugin/easysql/EasySQLRegistryImpl.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/command/EasySQLCommand.java b/core/src/main/java/cc/carm/plugin/easysql/command/EasySQLCommand.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/command/EasySQLCommand.java
rename to core/src/main/java/cc/carm/plugin/easysql/command/EasySQLCommand.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/command/EasySQLHelpFormatter.java b/core/src/main/java/cc/carm/plugin/easysql/command/EasySQLHelpFormatter.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/command/EasySQLHelpFormatter.java
rename to core/src/main/java/cc/carm/plugin/easysql/command/EasySQLHelpFormatter.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/configuration/PluginConfiguration.java b/core/src/main/java/cc/carm/plugin/easysql/configuration/PluginConfiguration.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/configuration/PluginConfiguration.java
rename to core/src/main/java/cc/carm/plugin/easysql/configuration/PluginConfiguration.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java b/core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java
rename to core/src/main/java/cc/carm/plugin/easysql/util/DBPropertiesUtil.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/JarResourceUtils.java b/core/src/main/java/cc/carm/plugin/easysql/util/JarResourceUtils.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/JarResourceUtils.java
rename to core/src/main/java/cc/carm/plugin/easysql/util/JarResourceUtils.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/MavenReadUtil.java b/core/src/main/java/cc/carm/plugin/easysql/util/MavenReadUtil.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/MavenReadUtil.java
rename to core/src/main/java/cc/carm/plugin/easysql/util/MavenReadUtil.java
diff --git a/easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/VersionReader.java b/core/src/main/java/cc/carm/plugin/easysql/util/VersionReader.java
similarity index 100%
rename from easysql-plugin-core/src/main/java/cc/carm/plugin/easysql/util/VersionReader.java
rename to core/src/main/java/cc/carm/plugin/easysql/util/VersionReader.java
diff --git a/easysql-plugin-core/src/main/resources/PLUGIN_INFO b/core/src/main/resources/PLUGIN_INFO
similarity index 100%
rename from easysql-plugin-core/src/main/resources/PLUGIN_INFO
rename to core/src/main/resources/PLUGIN_INFO
diff --git a/easysql-plugin-core/src/main/resources/acf-core_zh_CN.properties b/core/src/main/resources/acf-core_zh_CN.properties
similarity index 100%
rename from easysql-plugin-core/src/main/resources/acf-core_zh_CN.properties
rename to core/src/main/resources/acf-core_zh_CN.properties
diff --git a/easysql-plugin-core/src/main/resources/acf-minecraft_zh_CN.properties b/core/src/main/resources/acf-minecraft_zh_CN.properties
similarity index 100%
rename from easysql-plugin-core/src/main/resources/acf-minecraft_zh_CN.properties
rename to core/src/main/resources/acf-minecraft_zh_CN.properties
diff --git a/easysql-plugin-core/src/main/resources/config.yml b/core/src/main/resources/config.yml
similarity index 100%
rename from easysql-plugin-core/src/main/resources/config.yml
rename to core/src/main/resources/config.yml
diff --git a/easysql-plugin-core/src/main/resources/db-properties/.example-mysql.properties b/core/src/main/resources/db-properties/.example-mysql.properties
similarity index 100%
rename from easysql-plugin-core/src/main/resources/db-properties/.example-mysql.properties
rename to core/src/main/resources/db-properties/.example-mysql.properties
diff --git a/easysql-plugin-core/src/main/resources/versions.properties b/core/src/main/resources/versions.properties
similarity index 100%
rename from easysql-plugin-core/src/main/resources/versions.properties
rename to core/src/main/resources/versions.properties
diff --git a/platforms/easysql-plugin-bukkit/pom.xml b/platforms/bukkit/pom.xml
similarity index 100%
rename from platforms/easysql-plugin-bukkit/pom.xml
rename to platforms/bukkit/pom.xml
diff --git a/platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/BukkitConfiguration.java b/platforms/bukkit/src/main/java/cc/carm/plugin/easysql/BukkitConfiguration.java
similarity index 100%
rename from platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/BukkitConfiguration.java
rename to platforms/bukkit/src/main/java/cc/carm/plugin/easysql/BukkitConfiguration.java
diff --git a/platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java b/platforms/bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java
similarity index 100%
rename from platforms/easysql-plugin-bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java
rename to platforms/bukkit/src/main/java/cc/carm/plugin/easysql/EasySQLBukkit.java
diff --git a/platforms/easysql-plugin-bukkit/src/main/resources/plugin.yml b/platforms/bukkit/src/main/resources/plugin.yml
similarity index 100%
rename from platforms/easysql-plugin-bukkit/src/main/resources/plugin.yml
rename to platforms/bukkit/src/main/resources/plugin.yml
diff --git a/platforms/easysql-plugin-bungee/pom.xml b/platforms/bungee/pom.xml
similarity index 100%
rename from platforms/easysql-plugin-bungee/pom.xml
rename to platforms/bungee/pom.xml
diff --git a/platforms/easysql-plugin-bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java b/platforms/bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java
similarity index 100%
rename from platforms/easysql-plugin-bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java
rename to platforms/bungee/src/main/java/cc/carm/plugin/easysql/EasySQLBungee.java
diff --git a/platforms/easysql-plugin-sponge/pom.xml b/platforms/sponge/pom.xml
similarity index 100%
rename from platforms/easysql-plugin-sponge/pom.xml
rename to platforms/sponge/pom.xml
diff --git a/platforms/easysql-plugin-velocity/pom.xml b/platforms/velocity/pom.xml
similarity index 100%
rename from platforms/easysql-plugin-velocity/pom.xml
rename to platforms/velocity/pom.xml
diff --git a/platforms/easysql-plugin-velocity/src/main/java/cc/carm/plugin/easysql/EasySQLVelocity.java b/platforms/velocity/src/main/java/cc/carm/plugin/easysql/EasySQLVelocity.java
similarity index 100%
rename from platforms/easysql-plugin-velocity/src/main/java/cc/carm/plugin/easysql/EasySQLVelocity.java
rename to platforms/velocity/src/main/java/cc/carm/plugin/easysql/EasySQLVelocity.java
diff --git a/pom.xml b/pom.xml
index 561db9c..0efa206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,13 @@
     <packaging>pom</packaging>
     <version>0.0.3-SNAPSHOT</version>
     <modules>
-        <module>easysql-plugin-api</module>
-        <module>easysql-plugin-core</module>
+        <module>api</module>
+        <module>core</module>
 
-        <module>platforms/easysql-plugin-bukkit</module>
-        <module>platforms/easysql-plugin-bungee</module>
-        <module>platforms/easysql-plugin-velocity</module>
-        <module>platforms/easysql-plugin-sponge</module>
+        <module>platforms/bukkit</module>
+        <module>platforms/bungee</module>
+        <module>platforms/velocity</module>
+        <module>platforms/sponge</module>
     </modules>
 
     <name>EasySQL-Plugin</name>
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
+            <version>23.0.0</version>
             <scope>provided</scope>
         </dependency>