diff --git a/parabotv2/src/org/parabot/core/forum/AccountManager.java b/parabotv2/src/org/parabot/core/forum/AccountManager.java
index 510c5cb..08644cc 100644
--- a/parabotv2/src/org/parabot/core/forum/AccountManager.java
+++ b/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.servers.PublicServerExecuter;
+import org.parabot.environment.scripts.executers.SDNScriptExecuter;
+import org.parabot.environment.servers.executers.PublicServerExecuter;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/LocalJavaScripts.java b/parabotv2/src/org/parabot/core/parsers/scripts/LocalJavaScripts.java
index d6558f1..3374944 100644
--- a/parabotv2/src/org/parabot/core/parsers/scripts/LocalJavaScripts.java
+++ b/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;
diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java b/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java
index 9c72930..37bf5e2 100644
--- a/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java
+++ b/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;
diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java
index bef8adb..c25c571 100644
--- a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java
+++ b/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
diff --git a/parabotv2/src/org/parabot/core/parsers/servers/LocalServers.java b/parabotv2/src/org/parabot/core/parsers/servers/LocalServers.java
index 723891e..fb82095 100644
--- a/parabotv2/src/org/parabot/core/parsers/servers/LocalServers.java
+++ b/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;
 
 /**
diff --git a/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java b/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java
index 3a6eeae..c9f4eea 100644
--- a/parabotv2/src/org/parabot/core/parsers/servers/PublicServers.java
+++ b/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;
diff --git a/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java b/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java
index a6c4a83..9c8b04e 100644
--- a/parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java
+++ b/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;
diff --git a/parabotv2/src/org/parabot/environment/scripts/Script.java b/parabotv2/src/org/parabot/environment/scripts/Script.java
index 06a6b46..f4cde67 100644
--- a/parabotv2/src/org/parabot/environment/scripts/Script.java
+++ b/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;
diff --git a/parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java b/parabotv2/src/org/parabot/environment/scripts/executers/LocalScriptExecuter.java
similarity index 84%
rename from parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java
rename to parabotv2/src/org/parabot/environment/scripts/executers/LocalScriptExecuter.java
index aa1456d..cca3021 100644
--- a/parabotv2/src/org/parabot/environment/scripts/LocalScriptExecuter.java
+++ b/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
diff --git a/parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java b/parabotv2/src/org/parabot/environment/scripts/executers/SDNScriptExecuter.java
similarity index 97%
rename from parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java
rename to parabotv2/src/org/parabot/environment/scripts/executers/SDNScriptExecuter.java
index 8eb3fe1..d57dbb7 100644
--- a/parabotv2/src/org/parabot/environment/scripts/SDNScriptExecuter.java
+++ b/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;
 
 /**
diff --git a/parabotv2/src/org/parabot/environment/scripts/ScriptExecuter.java b/parabotv2/src/org/parabot/environment/scripts/executers/ScriptExecuter.java
similarity index 76%
rename from parabotv2/src/org/parabot/environment/scripts/ScriptExecuter.java
rename to parabotv2/src/org/parabot/environment/scripts/executers/ScriptExecuter.java
index e97b283..0e7b18d 100644
--- a/parabotv2/src/org/parabot/environment/scripts/ScriptExecuter.java
+++ b/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;
 
 /**
  * 
diff --git a/parabotv2/src/org/parabot/environment/scripts/Frameworks.java b/parabotv2/src/org/parabot/environment/scripts/framework/Frameworks.java
similarity index 82%
rename from parabotv2/src/org/parabot/environment/scripts/Frameworks.java
rename to parabotv2/src/org/parabot/environment/scripts/framework/Frameworks.java
index 0f66eea..6b600e7 100644
--- a/parabotv2/src/org/parabot/environment/scripts/Frameworks.java
+++ b/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
diff --git a/parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java b/parabotv2/src/org/parabot/environment/servers/executers/LocalServerExecuter.java
similarity index 93%
rename from parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java
rename to parabotv2/src/org/parabot/environment/servers/executers/LocalServerExecuter.java
index 73d301e..135ae02 100644
--- a/parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java
+++ b/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;
 
 /**
  * 
diff --git a/parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java b/parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java
similarity index 97%
rename from parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java
rename to parabotv2/src/org/parabot/environment/servers/executers/PublicServerExecuter.java
index 9453cbe..79783cf 100644
--- a/parabotv2/src/org/parabot/environment/servers/PublicServerExecuter.java
+++ b/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.*;
diff --git a/parabotv2/src/org/parabot/environment/servers/ServerExecuter.java b/parabotv2/src/org/parabot/environment/servers/executers/ServerExecuter.java
similarity index 84%
rename from parabotv2/src/org/parabot/environment/servers/ServerExecuter.java
rename to parabotv2/src/org/parabot/environment/servers/executers/ServerExecuter.java
index 8b40702..0d257bb 100644
--- a/parabotv2/src/org/parabot/environment/servers/ServerExecuter.java
+++ b/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;
 
 /**
  *