diff --git a/...s/sextante/servertools/geoserver/store.py → ...ns/sextante/admintools/geoserver/store.py b/...s/sextante/servertools/geoserver/store.py → ...ns/sextante/admintools/geoserver/store.py
@@ -1,6 +1,6 @@
-import sextante.servertools.geoserver.workspace as ws
-from sextante.servertools.geoserver.resource import featuretype_from_index, coverage_from_index
-from sextante.servertools.geoserver.support import ResourceInfo, xml_property, key_value_pairs, \
+import sextante.admintools.geoserver.workspace as ws
+from sextante.admintools.geoserver.resource import featuretype_from_index, coverage_from_index
+from sextante.admintools.geoserver.support import ResourceInfo, xml_property, key_value_pairs, \
         write_bool, write_dict, write_string, url
 
 def datastore_from_index(catalog, workspace, node):

diff --git a/...s/sextante/servertools/geoserver/style.py → ...ns/sextante/admintools/geoserver/style.py b/...s/sextante/servertools/geoserver/style.py → ...ns/sextante/admintools/geoserver/style.py
@@ -1,4 +1,4 @@
-from sextante.servertools.geoserver.support import ResourceInfo, url, xml_property
+from sextante.admintools.geoserver.support import ResourceInfo, url, xml_property
 
 class Style(ResourceInfo):
     def __init__(self, catalog, name):

diff --git a/...sextante/servertools/geoserver/support.py → .../sextante/admintools/geoserver/support.py b/...sextante/servertools/geoserver/support.py → .../sextante/admintools/geoserver/support.py
diff --git a/...ns/sextante/servertools/geoserver/util.py → ...ins/sextante/admintools/geoserver/util.py b/...ns/sextante/servertools/geoserver/util.py → ...ins/sextante/admintools/geoserver/util.py
diff --git a/...xtante/servertools/geoserver/workspace.py → ...extante/admintools/geoserver/workspace.py b/...xtante/servertools/geoserver/workspace.py → ...extante/admintools/geoserver/workspace.py
@@ -1,4 +1,4 @@
-from sextante.servertools.geoserver.support import xml_property, write_bool, ResourceInfo, url
+from sextante.admintools.geoserver.support import xml_property, write_bool, ResourceInfo, url
 
 def workspace_from_index(catalog, node):
     name = node.find("name")

diff --git a/python/plugins/sextante/admintools/httplib2/CMakeLists.txt b/python/plugins/sextante/admintools/httplib2/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+PLUGIN_INSTALL(sextante admintools/httplib2 ${PY_FILES})
diff --git a/...sextante/servertools/httplib2/__init__.py → .../sextante/admintools/httplib2/__init__.py b/...sextante/servertools/httplib2/__init__.py → .../sextante/admintools/httplib2/__init__.py
diff --git a/.../sextante/servertools/httplib2/iri2uri.py → ...s/sextante/admintools/httplib2/iri2uri.py b/.../sextante/servertools/httplib2/iri2uri.py → ...s/sextante/admintools/httplib2/iri2uri.py
diff --git a/...ns/sextante/servertools/httplib2/socks.py → ...ins/sextante/admintools/httplib2/socks.py b/...ns/sextante/servertools/httplib2/socks.py → ...ins/sextante/admintools/httplib2/socks.py
diff --git a/python/plugins/sextante/admintools/postgis_utils.py b/python/plugins/sextante/admintools/postgis_utils.py
diff --git a/python/plugins/sextante/core/Sextante.py b/python/plugins/sextante/core/Sextante.py
@@ -53,7 +53,7 @@
 from sextante.saga.SagaAlgorithmProvider import SagaAlgorithmProvider
 from sextante.script.ScriptAlgorithmProvider import ScriptAlgorithmProvider
 from sextante.taudem.TauDEMAlgorithmProvider import TauDEMAlgorithmProvider
-from sextante.servertools.GeoServerToolsAlgorithmProvider import GeoServerToolsAlgorithmProvider
+from sextante.admintools.AdminToolsAlgorithmProvider import AdminToolsAlgorithmProvider
 
 
 
@@ -129,7 +129,7 @@ def initialize():
         Sextante.addProvider(GrassAlgorithmProvider())
         Sextante.addProvider(ScriptAlgorithmProvider())
         Sextante.addProvider(TauDEMAlgorithmProvider())
-        Sextante.addProvider(GeoServerToolsAlgorithmProvider())
+        Sextante.addProvider(AdminToolsAlgorithmProvider())
         Sextante.modeler.initializeSettings();
         #and initialize
         SextanteLog.startLogging()

diff --git a/python/plugins/sextante/database/DatabaseToolsAlgorithmProvider.py b/python/plugins/sextante/database/DatabaseToolsAlgorithmProvider.py
diff --git a/python/plugins/sextante/images/postgis.png b/python/plugins/sextante/images/postgis.png
diff --git a/python/plugins/sextante/servertools/geoserver/CMakeLists.txt b/python/plugins/sextante/servertools/geoserver/CMakeLists.txt
diff --git a/python/plugins/sextante/servertools/httplib2/CMakeLists.txt b/python/plugins/sextante/servertools/httplib2/CMakeLists.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FILE(GLOB PY_FILES *.py)

		PLUGIN_INSTALL(sextante admintools/httplib2 ${PY_FILES})