rename packages 2

HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java

@@ -45,7 +45,7 @@ import org.jackhuang.hellominecraft.launcher.core.auth.AuthenticationException;
 import org.jackhuang.hellominecraft.launcher.core.launch.LaunchOptions;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
 import org.jackhuang.hellominecraft.util.Event;
-import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton;
+import org.jackhuang.hellominecraft.lookandfeel.comp.ConstomButton;
 import org.jackhuang.hellominecraft.util.func.Consumer;
 import org.jackhuang.hellominecraft.util.system.JavaProcessMonitor;
 import org.jackhuang.hellominecraft.util.ui.LogWindow;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/Main.java

@@ -25,9 +25,9 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.util.ui.LogWindow;
-import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
+import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
 import org.jackhuang.hellominecraft.util.UpdateChecker;
-import org.jackhuang.hellominecraft.svrmgr.views.MainWindow;
+import org.jackhuang.hellominecraft.svrmgr.ui.MainWindow;
 import org.jackhuang.hellominecraft.util.VersionNumber;
 import org.jackhuang.hellominecraft.lookandfeel.HelloMinecraftLookAndFeel;
 import org.jackhuang.hellominecraft.util.MessageBox;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitFormatThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.bukkit;
+package org.jackhuang.hellominecraft.svrmgr.install.bukkit;
 
 import java.io.IOException;
 import java.util.ArrayList;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/bukkit/BukkitVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.bukkit;
+package org.jackhuang.hellominecraft.svrmgr.install.bukkit;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeFormatThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 import java.io.IOException;
 import java.util.ArrayList;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeInstaller.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 import com.google.gson.Gson;
 import java.io.BufferedOutputStream;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/ForgeVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/Install.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/InstallProfile.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftLibrary.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 import java.io.File;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/install/cauldron/MinecraftVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.installer.cauldron;
+package org.jackhuang.hellominecraft.svrmgr.install.cauldron;
 
 import java.util.List;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/BukkitPlugin.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.cbplugins;
+package org.jackhuang.hellominecraft.svrmgr.plugin;
 
 import java.util.List;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/Category.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.cbplugins;
+package org.jackhuang.hellominecraft.svrmgr.plugin;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInfo.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.cbplugins;
+package org.jackhuang.hellominecraft.svrmgr.plugin;
 
 import java.util.List;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginInformation.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.cbplugins;
+package org.jackhuang.hellominecraft.svrmgr.plugin;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginManager.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.cbplugins;
+package org.jackhuang.hellominecraft.svrmgr.plugin;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/plugin/PluginVersion.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.cbplugins;
+package org.jackhuang.hellominecraft.svrmgr.plugin;
 
 import java.util.List;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/BackupManager.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.backups;
+package org.jackhuang.hellominecraft.svrmgr.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.util.system.Compressor;
-import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
-import org.jackhuang.hellominecraft.svrmgr.utils.Utilities;
+import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
+import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.util.system.IOUtils;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ScheduleTranslator.java

@@ -17,9 +17,12 @@
  */
 package org.jackhuang.hellominecraft.svrmgr.server;
 
+import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoBackupSchedule;
+import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoRestartSchedule;
+import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoSaveSchedule;
+import org.jackhuang.hellominecraft.svrmgr.server.schedule.AutoBroadcastSchedule;
 import java.util.TimerTask;
-import org.jackhuang.hellominecraft.svrmgr.server.schedules.*;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/Server.java

@@ -40,11 +40,11 @@ import org.jackhuang.hellominecraft.util.system.IOUtils;
 import org.jackhuang.hellominecraft.util.MessageBox;
 import org.jackhuang.hellominecraft.util.Pair;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
-import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
-import org.jackhuang.hellominecraft.svrmgr.threads.MonitorThread;
-import org.jackhuang.hellominecraft.svrmgr.threads.WaitForThread;
-import org.jackhuang.hellominecraft.svrmgr.utils.Utilities;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
+import org.jackhuang.hellominecraft.svrmgr.util.MonitorThread;
+import org.jackhuang.hellominecraft.svrmgr.util.WaitForThread;
+import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
 import org.jackhuang.hellominecraft.util.Event;
 import org.jackhuang.hellominecraft.util.EventHandler;
 import org.jackhuang.hellominecraft.util.func.Consumer;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/ServerDownloadPackage.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.download;
+package org.jackhuang.hellominecraft.svrmgr.server;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBackupSchedule.java

@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import java.util.TimerTask;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.server.backups.BackupManager;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.server.BackupManager;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoBroadcastSchedule.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import java.util.TimerTask;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoExecuteSchedule.java

@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import java.io.IOException;
 import java.util.TimerTask;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoRestartSchedule.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import java.util.TimerTask;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSaveSchedule.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import java.util.TimerTask;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSchedule.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import java.util.TimerTask;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/server/schedule/AutoSendCommandSchedule.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.server.schedules;
+package org.jackhuang.hellominecraft.svrmgr.server.schedule;
 
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/BannedPlayers.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Op.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/PlayerList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 import com.google.gson.Gson;
 import java.io.File;
@@ -25,7 +25,7 @@ import java.util.UUID;
 import org.jackhuang.hellominecraft.util.logging.HMCLog;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.svrmgr.settings.PlayerList.BasePlayer;
+import org.jackhuang.hellominecraft.svrmgr.setting.PlayerList.BasePlayer;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Schedule.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/ServerProperties.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 import java.io.File;
 import java.io.FileInputStream;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/Settings.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 import java.util.ArrayList;
 

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/SettingsManager.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/setting/WhiteList.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.settings;
+package org.jackhuang.hellominecraft.svrmgr.setting;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/CommandsWindow.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.views;
+package org.jackhuang.hellominecraft.svrmgr.ui;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/InputDialog.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.views;
+package org.jackhuang.hellominecraft.svrmgr.ui;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/MainWindow.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.
  */
-package org.jackhuang.hellominecraft.svrmgr.views;
+package org.jackhuang.hellominecraft.svrmgr.ui;
 
 import java.awt.Dimension;
 import java.awt.Image;
@@ -52,41 +52,41 @@ import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.util.tasks.download.HTTPGetTask;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.svrmgr.utils.IMonitorService;
+import org.jackhuang.hellominecraft.svrmgr.util.IMonitorService;
 import org.jackhuang.hellominecraft.util.system.IOUtils;
 import org.jackhuang.hellominecraft.util.MessageBox;
-import org.jackhuang.hellominecraft.svrmgr.utils.ModType;
-import org.jackhuang.hellominecraft.svrmgr.utils.MonitorInfoBean;
-import org.jackhuang.hellominecraft.svrmgr.utils.MonitorServiceImpl;
+import org.jackhuang.hellominecraft.svrmgr.util.ModType;
+import org.jackhuang.hellominecraft.svrmgr.util.MonitorInfoBean;
+import org.jackhuang.hellominecraft.svrmgr.util.MonitorServiceImpl;
 import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersions;
 import org.jackhuang.hellominecraft.svrmgr.Main;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.BukkitPlugin;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.Category;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInfo;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInformation;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginManager;
-import org.jackhuang.hellominecraft.svrmgr.installer.bukkit.BukkitFormatThread;
-import org.jackhuang.hellominecraft.svrmgr.installer.bukkit.BukkitVersion;
-import org.jackhuang.hellominecraft.svrmgr.installer.cauldron.ForgeFormatThread;
-import org.jackhuang.hellominecraft.svrmgr.installer.cauldron.ForgeInstaller;
-import org.jackhuang.hellominecraft.svrmgr.installer.cauldron.ForgeVersion;
+import org.jackhuang.hellominecraft.svrmgr.plugin.BukkitPlugin;
+import org.jackhuang.hellominecraft.svrmgr.plugin.Category;
+import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInfo;
+import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInformation;
+import org.jackhuang.hellominecraft.svrmgr.plugin.PluginManager;
+import org.jackhuang.hellominecraft.svrmgr.install.bukkit.BukkitFormatThread;
+import org.jackhuang.hellominecraft.svrmgr.install.bukkit.BukkitVersion;
+import org.jackhuang.hellominecraft.svrmgr.install.cauldron.ForgeFormatThread;
+import org.jackhuang.hellominecraft.svrmgr.install.cauldron.ForgeInstaller;
+import org.jackhuang.hellominecraft.svrmgr.install.cauldron.ForgeVersion;
 import org.jackhuang.hellominecraft.svrmgr.server.ScheduleTranslator;
 import org.jackhuang.hellominecraft.svrmgr.server.Server;
 import org.jackhuang.hellominecraft.svrmgr.server.ServerChecker;
-import org.jackhuang.hellominecraft.svrmgr.server.backups.BackupManager;
-import org.jackhuang.hellominecraft.svrmgr.settings.BannedPlayers;
-import org.jackhuang.hellominecraft.svrmgr.settings.Op;
-import org.jackhuang.hellominecraft.svrmgr.settings.Schedule;
-import org.jackhuang.hellominecraft.svrmgr.settings.ServerProperties;
-import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
-import org.jackhuang.hellominecraft.svrmgr.settings.WhiteList;
-import org.jackhuang.hellominecraft.svrmgr.threads.MonitorThread;
-import org.jackhuang.hellominecraft.svrmgr.utils.FolderOpener;
-import org.jackhuang.hellominecraft.svrmgr.utils.IPGet;
-import org.jackhuang.hellominecraft.svrmgr.utils.Utilities;
+import org.jackhuang.hellominecraft.svrmgr.server.BackupManager;
+import org.jackhuang.hellominecraft.svrmgr.setting.BannedPlayers;
+import org.jackhuang.hellominecraft.svrmgr.setting.Op;
+import org.jackhuang.hellominecraft.svrmgr.setting.Schedule;
+import org.jackhuang.hellominecraft.svrmgr.setting.ServerProperties;
+import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
+import org.jackhuang.hellominecraft.svrmgr.setting.WhiteList;
+import org.jackhuang.hellominecraft.svrmgr.util.MonitorThread;
+import org.jackhuang.hellominecraft.svrmgr.util.FolderOpener;
+import org.jackhuang.hellominecraft.svrmgr.util.IPGet;
+import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
 import org.jackhuang.hellominecraft.util.ui.SwingUtils;
 import org.jackhuang.hellominecraft.util.version.MinecraftRemoteVersion;
-import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton;
+import org.jackhuang.hellominecraft.lookandfeel.comp.ConstomButton;
 import org.jackhuang.hellominecraft.util.Event;
 import org.jackhuang.hellominecraft.util.StrUtils;
 
@@ -2157,7 +2157,6 @@ public final class MainWindow extends javax.swing.JFrame
         jScrollPane19.setViewportView(lstMCPC);
 
         btnDownloadMCPC.setText(C.i18n("download")); // NOI18N
-        btnDownloadMCPC.setLabel("下载");
         btnDownloadMCPC.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 btnDownloadMCPCActionPerformed(evt);
@@ -2166,7 +2165,6 @@ public final class MainWindow extends javax.swing.JFrame
 
         lstRefreshMCPC.setText(C.i18n("ui.button.refresh")); // NOI18N
         lstRefreshMCPC.setToolTipText("");
-        lstRefreshMCPC.setLabel("刷新");
         lstRefreshMCPC.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 lstRefreshMCPCActionPerformed(evt);

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/ui/PluginInfoDialog.java

@@ -15,16 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.views;
+package org.jackhuang.hellominecraft.svrmgr.ui;
 
 import java.io.File;
 import javax.swing.table.DefaultTableModel;
 import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.util.StrUtils;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginInfo;
-import org.jackhuang.hellominecraft.svrmgr.cbplugins.PluginVersion;
-import org.jackhuang.hellominecraft.svrmgr.utils.Utilities;
+import org.jackhuang.hellominecraft.svrmgr.plugin.PluginInfo;
+import org.jackhuang.hellominecraft.svrmgr.plugin.PluginVersion;
+import org.jackhuang.hellominecraft.svrmgr.util.Utilities;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/FolderOpener.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.io.File;
 import org.jackhuang.hellominecraft.util.MessageBox;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IMonitorService.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/IPGet.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/ModType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.io.File;
 import java.io.IOException;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorInfoBean.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 /**
  *

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorServiceImpl.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/MonitorThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.threads;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/Utilities.java

@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.utils;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.io.File;
-import org.jackhuang.hellominecraft.svrmgr.settings.SettingsManager;
+import org.jackhuang.hellominecraft.svrmgr.setting.SettingsManager;
 import org.jackhuang.hellominecraft.util.system.IOUtils;
 
 /**

HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/WaitForThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.svrmgr.threads;
+package org.jackhuang.hellominecraft.svrmgr.util;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/ConstomButton.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.
  */
-package org.jackhuang.hellominecraft.lookandfeel.components;
+package org.jackhuang.hellominecraft.lookandfeel.comp;
 
 import java.awt.Color;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;

MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/comp/IConstomable.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.
  */
-package org.jackhuang.hellominecraft.lookandfeel.components;
+package org.jackhuang.hellominecraft.lookandfeel.comp;
 
 /**
  *

MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ButtonPainter.java

@@ -18,7 +18,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-package org.jackhuang.hellominecraft.lookandfeel.painters;
+package org.jackhuang.hellominecraft.lookandfeel.painter;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -31,7 +31,7 @@ import javax.swing.plaf.synth.SynthConstants;
 import javax.swing.plaf.synth.SynthContext;
 import javax.swing.plaf.synth.SynthPainter;
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
-import org.jackhuang.hellominecraft.lookandfeel.components.ConstomButton;
+import org.jackhuang.hellominecraft.lookandfeel.comp.ConstomButton;
 
 /**
  * ButtonPainter - handles painting Nimbus style buttons with Java2D

MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/ProgressPainter.java

@@ -18,7 +18,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-package org.jackhuang.hellominecraft.lookandfeel.painters;
+package org.jackhuang.hellominecraft.lookandfeel.painter;
 
 import org.jackhuang.hellominecraft.lookandfeel.GraphicsUtils;
 

MetroLookAndFeel/src/main/java/org/jackhuang/hellominecraft/lookandfeel/painter/TextFieldPainter.java

@@ -18,7 +18,7 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-package org.jackhuang.hellominecraft.lookandfeel.painters;
+package org.jackhuang.hellominecraft.lookandfeel.painter;
 
 import javax.swing.plaf.synth.SynthContext;
 import javax.swing.plaf.synth.SynthPainter;