diff --git a/OpenSim/Server/Base/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
similarity index 98%
rename from OpenSim/Server/Base/PluginManager.cs
rename to OpenSim/Framework/PluginManager.cs
index d2cf668356..188d90ae6d 100644
--- a/OpenSim/Server/Base/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -38,13 +38,17 @@ using Mono.Addins.Setup;
 using Mono.Addins.Description;
 using OpenSim.Framework;
 
-namespace OpenSim.Server.Base
+
+namespace OpenSim.Framework
 {
+    /// <summary>
+    /// Manager for registries and plugins
+    /// </summary>
 	public class PluginManager : SetupService
 	{
-		protected AddinRegistry PluginRegistry;
+		public AddinRegistry PluginRegistry;
 
-		internal PluginManager(AddinRegistry registry): base (registry)
+		public PluginManager(AddinRegistry registry): base (registry)
         {
 			PluginRegistry = registry;
 
@@ -554,4 +558,4 @@ namespace OpenSim.Server.Base
         }
         #endregion Util
 	}
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Server/Base/CommandManager.cs b/OpenSim/Server/Base/CommandManager.cs
index 45652b30f9..88aac00fb5 100644
--- a/OpenSim/Server/Base/CommandManager.cs
+++ b/OpenSim/Server/Base/CommandManager.cs
@@ -33,15 +33,21 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Mono.Addins;
-using Mono.Addins.Setup;
+// using Mono.Addins.Setup;
 using Mono.Addins.Description;
 using OpenSim.Framework;
 
 namespace OpenSim.Server.Base
 {
+    /// <summary>
+    /// Command manager -
+    /// Wrapper for OpenSim.Framework.PluginManager to allow 
+    /// us to add commands to the console to perform operations
+    /// on our repos and plugins
+    /// </summary>
 	public class CommandManager
 	{
-		protected AddinRegistry PluginRegistry;
+		public AddinRegistry PluginRegistry;
 		protected PluginManager PluginManager;
 
 		public CommandManager(AddinRegistry registry)
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 8ecf3d36b7..31b04465b6 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -111,17 +111,18 @@ namespace OpenSim.Server.Base
                 case ExtensionChange.Add:
                     if (a.AddinFile.Contains(Registry.DefaultAddinsFolder))
                     {
-                        m_log.InfoFormat("[SERVER]: Adding {0}", a.Name);
+                        m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name);
                         connector.PluginPath = String.Format("{0}/{1}", Registry.DefaultAddinsFolder, a.Name.Replace(',', '.'));
                     }
                     else
                     {
-                        m_log.InfoFormat("[SERVER]: Removing {0}", a.Name);
+                        m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name);
                         connector.PluginPath = a.AddinFile;
                     }
                     LoadPlugin(connector);
                     break;
                 case ExtensionChange.Remove:
+                    m_log.InfoFormat("[SERVER]: Removing {0}", a.Name);
                     UnloadPlugin(connector);
                     break;
             }
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs
index 067fd2a0fb..72014dba7d 100644
--- a/OpenSim/Server/Handlers/Base/ServerConnector.cs
+++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs
@@ -41,8 +41,7 @@ namespace OpenSim.Server.Handlers.Base
     {
         public virtual string ConfigURL
         {
-            get;
-            protected set;
+            get { return String.Empty; }
         }
 
         public virtual string ConfigName
@@ -95,7 +94,10 @@ namespace OpenSim.Server.Handlers.Base
             return config;
         }
 
-        // We get our remote initial configuration for bootstrapping
+        // We get our remote initial configuration for bootstrapping in case
+        // we have no configuration in our main file or in an existing
+        // modular config file. This is the last resort to bootstrap the 
+        // configuration, likely a new plugin loading for the first time.
         private IConfigSource GetConfigSource()
         {
             IConfigSource source = null;
diff --git a/prebuild.xml b/prebuild.xml
index 82c4dc9e69..6c58e38307 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -105,6 +105,7 @@
       <Reference name="Nini" path="../../bin/"/>
       <Reference name="log4net" path="../../bin/"/>
       <Reference name="Mono.Addins" path="../../bin/"/>
+      <Reference name="Mono.Addins.Setup" path="../../bin/"/>
       <Reference name="SmartThreadPool"/>
       <Files>
         <Match pattern="*.cs" recurse="false"/>
@@ -737,7 +738,6 @@
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
       <Reference name="Mono.Addins" path="../../../bin/"/>
-      <Reference name="Mono.Addins.Setup" path="../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>