diff --git a/plugin.xml b/plugin.xml
index 03b856e..5b378b0 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
     <id>com.fr.solution.plugin.better.sql.editor</id>
+    <main-package>com.fr.solution.plugin</main-package>
     <name><![CDATA[数据集中SQL可全屏]]></name>
     <active>yes</active>
     <version>2.4</version>
@@ -14,11 +15,11 @@
     ]]>
     </change-notes>
     <extra-core>
-        <LocaleFinder class="com.fr.solution.plugin.better.sql.editor.BetterLocaleFinder"/>
+        <LocaleFinder class="com.fr.solution.plugin.better.sql.BetterLocaleFinder"/>
     </extra-core>
     <extra-designer>
-        <TableDataDefineProvider class="com.fr.solution.plugin.better.sql.editor.BetterDBTableDataImpl"/>
-        <ServerTableDataDefineProvider class="com.fr.solution.plugin.better.sql.editor.BetterDBTableDataImpl"/>
+        <TableDataDefineProvider class="com.fr.solution.plugin.better.sql.BetterDBTableDataBridge"/>
+        <ServerTableDataDefineProvider class="com.fr.solution.plugin.better.sql.BetterDBTableDataBridge"/>
     </extra-designer>
     <function-recorder class="com.fr.solution.plugin.better.sql.editor.FullScreenSQLPane"/>
 </plugin>
\ No newline at end of file
diff --git a/src/main/java/com/fr/solution/plugin/better/sql/editor/BetterDBTableDataImpl.java b/src/main/java/com/fr/solution/plugin/better/sql/BetterDBTableDataBridge.java
similarity index 73%
rename from src/main/java/com/fr/solution/plugin/better/sql/editor/BetterDBTableDataImpl.java
rename to src/main/java/com/fr/solution/plugin/better/sql/BetterDBTableDataBridge.java
index d1d4103..50111a3 100644
--- a/src/main/java/com/fr/solution/plugin/better/sql/editor/BetterDBTableDataImpl.java
+++ b/src/main/java/com/fr/solution/plugin/better/sql/BetterDBTableDataBridge.java
@@ -1,18 +1,19 @@
-package com.fr.solution.plugin.better.sql.editor;
+package com.fr.solution.plugin.better.sql;
 
 import com.fr.base.TableData;
 import com.fr.data.impl.DBTableData;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
 import com.fr.design.fun.ServerTableDataDefineProvider;
 import com.fr.design.fun.impl.AbstractTableDataDefineProvider;
-import com.fr.general.Inter;
+import com.fr.design.i18n.Toolkit;
+import com.fr.solution.plugin.better.sql.editor.BetterDBTableDataPane;
 
 /**
  * @author richie
  * @date 2015-06-04
  * @since 8.0
  */
-public class BetterDBTableDataImpl extends AbstractTableDataDefineProvider implements ServerTableDataDefineProvider {
+public class BetterDBTableDataBridge extends AbstractTableDataDefineProvider implements ServerTableDataDefineProvider {
 
     @Override
     public Class<? extends TableData> classForTableData() {
@@ -31,7 +32,7 @@ public class BetterDBTableDataImpl extends AbstractTableDataDefineProvider imple
 
     @Override
     public String nameForTableData() {
-        return Inter.getLocText("DS-Database_Query");
+        return Toolkit.i18nText("Plugin-Better_SQL_Editor_Database_Query");
     }
 
     @Override
diff --git a/src/main/java/com/fr/solution/plugin/better/sql/editor/BetterLocaleFinder.java b/src/main/java/com/fr/solution/plugin/better/sql/BetterLocaleFinder.java
similarity index 84%
rename from src/main/java/com/fr/solution/plugin/better/sql/editor/BetterLocaleFinder.java
rename to src/main/java/com/fr/solution/plugin/better/sql/BetterLocaleFinder.java
index 6341742..8b2ed9e 100644
--- a/src/main/java/com/fr/solution/plugin/better/sql/editor/BetterLocaleFinder.java
+++ b/src/main/java/com/fr/solution/plugin/better/sql/BetterLocaleFinder.java
@@ -1,4 +1,4 @@
-package com.fr.solution.plugin.better.sql.editor;
+package com.fr.solution.plugin.better.sql;
 
 import com.fr.stable.fun.impl.AbstractLocaleFinder;