Proper packaging

parabotv2/src/org/parabot/core/forum/AccountManager.java

@@ -6,8 +6,8 @@ import org.parabot.core.parsers.scripts.SDNScripts;
 import org.parabot.core.parsers.servers.PublicServers;
 import org.parabot.core.ui.LoginUI;
 import org.parabot.environment.api.utils.WebUtil;
-import org.parabot.environment.scripts.SDNScriptExecuter;
+import org.parabot.environment.scripts.executers.SDNScriptExecuter;
-import org.parabot.environment.servers.PublicServerExecuter;
+import org.parabot.environment.servers.executers.PublicServerExecuter;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

parabotv2/src/org/parabot/core/parsers/scripts/LocalJavaScripts.java

@@ -3,8 +3,8 @@ package org.parabot.core.parsers.scripts;
 import org.parabot.core.Directories;
 import org.parabot.core.classpath.ClassPath;
 import org.parabot.core.desc.ScriptDescription;
-import org.parabot.environment.scripts.LocalScriptExecuter;
 import org.parabot.environment.scripts.ScriptManifest;
+import org.parabot.environment.scripts.executers.LocalScriptExecuter;
 import org.parabot.environment.scripts.loader.JavaScriptLoader;
 
 import java.lang.reflect.Constructor;

parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java

@@ -5,7 +5,7 @@ import org.parabot.core.desc.ScriptDescription;
 import org.parabot.core.forum.AccountManager;
 import org.parabot.core.forum.AccountManagerAccess;
 import org.parabot.environment.api.utils.WebUtil;
-import org.parabot.environment.scripts.SDNScriptExecuter;
+import org.parabot.environment.scripts.executers.SDNScriptExecuter;
 
 import java.io.BufferedReader;
 import java.net.URL;

parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java

@@ -7,7 +7,7 @@ import java.util.TreeMap;
 
 import org.parabot.core.Core;
 import org.parabot.core.desc.ScriptDescription;
-import org.parabot.environment.scripts.ScriptExecuter;
+import org.parabot.environment.scripts.executers.ScriptExecuter;
 
 /**
  * Abstract class for parsing scripts

parabotv2/src/org/parabot/core/parsers/servers/LocalServers.java

@@ -6,8 +6,8 @@ import java.util.ArrayList;
 import org.parabot.core.Directories;
 import org.parabot.core.classpath.ClassPath;
 import org.parabot.core.desc.ServerDescription;
-import org.parabot.environment.servers.LocalServerExecuter;
 import org.parabot.environment.servers.ServerManifest;
+import org.parabot.environment.servers.executers.LocalServerExecuter;
 import org.parabot.environment.servers.loader.ServerLoader;
 
 /**

parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java

@@ -5,7 +5,7 @@ import org.parabot.core.desc.ServerDescription;
 import org.parabot.core.forum.AccountManager;
 import org.parabot.core.forum.AccountManagerAccess;
 import org.parabot.environment.api.utils.WebUtil;
-import org.parabot.environment.servers.PublicServerExecuter;
+import org.parabot.environment.servers.executers.PublicServerExecuter;
 
 import java.io.BufferedReader;
 import java.net.URL;

parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java

@@ -2,7 +2,7 @@ package org.parabot.core.parsers.servers;
 
 import org.parabot.core.Core;
 import org.parabot.core.desc.ServerDescription;
-import org.parabot.environment.servers.ServerExecuter;
+import org.parabot.environment.servers.executers.ServerExecuter;
 
 import java.util.ArrayList;
 import java.util.HashMap;

parabotv2/src/org/parabot/environment/scripts/Script.java

@@ -5,6 +5,7 @@ import org.parabot.core.Core;
 import org.parabot.core.ui.BotUI;
 import org.parabot.environment.api.utils.Time;
 import org.parabot.environment.scripts.framework.AbstractFramework;
+import org.parabot.environment.scripts.framework.Frameworks;
 import org.parabot.environment.scripts.framework.LoopTask;
 import org.parabot.environment.scripts.framework.SleepCondition;
 import org.parabot.environment.scripts.framework.Strategy;

parabotv2/src/org/parabot/environment/scripts/executers/LocalScriptExecuter.java

@@ -1,7 +1,9 @@
-package org.parabot.environment.scripts;
+package org.parabot.environment.scripts.executers;
 
 import java.lang.reflect.Constructor;
 
+import org.parabot.environment.scripts.Script;
+
 /**
  * 
  * Loads a locally stored script

parabotv2/src/org/parabot/environment/scripts/executers/SDNScriptExecuter.java

@@ -1,4 +1,4 @@
-package org.parabot.environment.scripts;
+package org.parabot.environment.scripts.executers;
 
 import java.lang.reflect.Constructor;
 import java.net.URL;
@@ -12,6 +12,7 @@ import org.parabot.core.forum.AccountManager;
 import org.parabot.core.forum.AccountManagerAccess;
 import org.parabot.core.ui.utils.UILog;
 import org.parabot.environment.api.utils.WebUtil;
+import org.parabot.environment.scripts.Script;
 import org.parabot.environment.scripts.loader.JavaScriptLoader;
 
 /**

parabotv2/src/org/parabot/environment/scripts/executers/ScriptExecuter.java

@@ -1,4 +1,6 @@
-package org.parabot.environment.scripts;
+package org.parabot.environment.scripts.executers;
+
+import org.parabot.environment.scripts.Script;
 
 /**
  * 

parabotv2/src/org/parabot/environment/scripts/framework/Frameworks.java

@@ -1,11 +1,7 @@
-package org.parabot.environment.scripts;
+package org.parabot.environment.scripts.framework;
 
 import java.util.Collection;
 
-import org.parabot.environment.scripts.framework.AbstractFramework;
-import org.parabot.environment.scripts.framework.LoopTask;
-import org.parabot.environment.scripts.framework.Strategy;
-
 /**
  * 
  * Holds various script frameworks

parabotv2/src/org/parabot/environment/servers/executers/LocalServerExecuter.java

@@ -1,4 +1,4 @@
-package org.parabot.environment.servers;
+package org.parabot.environment.servers.executers;
 
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
@@ -7,6 +7,7 @@ import org.parabot.core.Core;
 import org.parabot.core.Directories;
 import org.parabot.core.build.BuildPath;
 import org.parabot.core.classpath.ClassPath;
+import org.parabot.environment.servers.ServerProvider;
 
 /**
  * 

parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java

@@ -1,4 +1,4 @@
-package org.parabot.environment.servers;
+package org.parabot.environment.servers.executers;
 
 import org.parabot.core.Configuration;
 import org.parabot.core.Context;
@@ -12,6 +12,7 @@ import org.parabot.core.forum.AccountManagerAccess;
 import org.parabot.core.ui.components.VerboseLoader;
 import org.parabot.core.ui.utils.UILog;
 import org.parabot.environment.api.utils.WebUtil;
+import org.parabot.environment.servers.ServerProvider;
 import org.parabot.environment.servers.loader.ServerLoader;
 
 import javax.swing.*;

parabotv2/src/org/parabot/environment/servers/executers/ServerExecuter.java

@@ -1,7 +1,8 @@
-package org.parabot.environment.servers;
+package org.parabot.environment.servers.executers;
 
 import org.parabot.core.Context;
 import org.parabot.core.ui.components.PaintComponent;
+import org.parabot.environment.servers.ServerProvider;
 
 /**
  *