40 files changed, 34 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index 11777bce..8692bff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bin data po src service
+SUBDIRS = bin data po src service extensions
 
 DISTCLEANFILES =		\
 	intltool-extract	\
diff --git a/bin/sugar-shell b/bin/sugar-shell
index 3d32de3..d04b2cc 100644
--- a/bin/sugar-shell
+++ b/bin/sugar-shell
@@ -15,10 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import sys
 import os
 import gettext
 import logging
-
+import pkg_resources
 import gtk
 import gobject
 import dbus.glib
@@ -59,6 +60,8 @@ def main():
 
     logger.start('shell')
 
+    sys.path.append(config.ext_path)
+
     gettext.bindtextdomain('sugar', config.locale_path)
     gettext.textdomain('sugar')
 
diff --git a/configure.ac b/configure.ac
index 7ae0d98..a5c630f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,17 +41,19 @@ Makefile
 bin/Makefile
 data/Makefile
 data/icons/Makefile
+extensions/Makefile
+extensions/cpsection/Makefile
+extensions/cpsection/aboutme/Makefile
+extensions/cpsection/aboutxo/Makefile
+extensions/cpsection/datetime/Makefile
+extensions/cpsection/frame/Makefile
+extensions/cpsection/language/Makefile
+extensions/cpsection/network/Makefile
+extensions/cpsection/power/Makefile
 service/Makefile
 src/Makefile
 src/jarabe/Makefile
 src/jarabe/controlpanel/Makefile
-src/jarabe/controlpanel/aboutme/Makefile
-src/jarabe/controlpanel/aboutxo/Makefile
-src/jarabe/controlpanel/datetime/Makefile
-src/jarabe/controlpanel/frame/Makefile
-src/jarabe/controlpanel/language/Makefile
-src/jarabe/controlpanel/network/Makefile
-src/jarabe/controlpanel/power/Makefile
 src/jarabe/desktop/Makefile
 src/jarabe/frame/Makefile
 src/jarabe/frame/devices/Makefile
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
new file mode 100644
index 0000000..464800b
--- /dev/null
+++ b/extensions/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = cpsection
diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
new file mode 100644
index 0000000..0e69fd1
--- /dev/null
+++ b/extensions/cpsection/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = aboutme aboutxo datetime frame language network power
+
+sugardir = $(pkgdatadir)/extensions/cpsection
+sugar_PYTHON = __init__.py
diff --git a/extensions/cpsection/__init__.py b/extensions/cpsection/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/extensions/cpsection/__init__.py
diff --git a/src/jarabe/controlpanel/datetime/Makefile.am b/extensions/cpsection/aboutme/Makefile.am
index f522683..9ca91d2 100644
--- a/src/jarabe/controlpanel/datetime/Makefile.am
+++ b/extensions/cpsection/aboutme/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/jarabe/controlpanel/datetime
+sugardir = $(pkgdatadir)/extensions/cpsection/aboutme
 
 sugar_PYTHON = 		\
 	__init__.py	\
diff --git a/src/jarabe/controlpanel/aboutme/__init__.py b/extensions/cpsection/aboutme/__init__.py
index b683e28..b683e28 100644
--- a/src/jarabe/controlpanel/aboutme/__init__.py
+++ b/extensions/cpsection/aboutme/__init__.py
diff --git a/src/jarabe/controlpanel/aboutme/model.py b/extensions/cpsection/aboutme/model.py
index 3818792..3818792 100644
--- a/src/jarabe/controlpanel/aboutme/model.py
+++ b/extensions/cpsection/aboutme/model.py
diff --git a/src/jarabe/controlpanel/aboutme/view.py b/extensions/cpsection/aboutme/view.py
index fc4f351..fc4f351 100644
--- a/src/jarabe/controlpanel/aboutme/view.py
+++ b/extensions/cpsection/aboutme/view.py
diff --git a/src/jarabe/controlpanel/frame/Makefile.am b/extensions/cpsection/aboutxo/Makefile.am
index 10e2b40..3f71af0 100644
--- a/src/jarabe/controlpanel/frame/Makefile.am
+++ b/extensions/cpsection/aboutxo/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/jarabe/controlpanel/frame
+sugardir = $(pkgdatadir)/extensions/cpsection/aboutxo
 
 sugar_PYTHON = 		\
 	__init__.py	\
diff --git a/src/jarabe/controlpanel/aboutxo/__init__.py b/extensions/cpsection/aboutxo/__init__.py
index 4dc2cb2..4dc2cb2 100644
--- a/src/jarabe/controlpanel/aboutxo/__init__.py
+++ b/extensions/cpsection/aboutxo/__init__.py
diff --git a/src/jarabe/controlpanel/aboutxo/model.py b/extensions/cpsection/aboutxo/model.py
index ebbcca7..ebbcca7 100644
--- a/src/jarabe/controlpanel/aboutxo/model.py
+++ b/extensions/cpsection/aboutxo/model.py
diff --git a/src/jarabe/controlpanel/aboutxo/view.py b/extensions/cpsection/aboutxo/view.py
index a3afa10..a3afa10 100644
--- a/src/jarabe/controlpanel/aboutxo/view.py
+++ b/extensions/cpsection/aboutxo/view.py
diff --git a/src/jarabe/controlpanel/aboutme/Makefile.am b/extensions/cpsection/datetime/Makefile.am
index da77593..b5b518e 100644
--- a/src/jarabe/controlpanel/aboutme/Makefile.am
+++ b/extensions/cpsection/datetime/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/jarabe/controlpanel/aboutme
+sugardir = $(pkgdatadir)/extensions/cpsection/datetime
 
 sugar_PYTHON = 		\
 	__init__.py	\
diff --git a/src/jarabe/controlpanel/datetime/__init__.py b/extensions/cpsection/datetime/__init__.py
index fc9be45..fc9be45 100644
--- a/src/jarabe/controlpanel/datetime/__init__.py
+++ b/extensions/cpsection/datetime/__init__.py
diff --git a/src/jarabe/controlpanel/datetime/model.py b/extensions/cpsection/datetime/model.py
index 4a4c560..4a4c560 100644
--- a/src/jarabe/controlpanel/datetime/model.py
+++ b/extensions/cpsection/datetime/model.py
diff --git a/src/jarabe/controlpanel/datetime/view.py b/extensions/cpsection/datetime/view.py
index 58719b4..58719b4 100644
--- a/src/jarabe/controlpanel/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
diff --git a/src/jarabe/controlpanel/aboutme/Makefile.am b/extensions/cpsection/frame/Makefile.am
index da77593..1e09c04 100644
--- a/src/jarabe/controlpanel/aboutme/Makefile.am
+++ b/extensions/cpsection/frame/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/jarabe/controlpanel/aboutme
+sugardir = $(pkgdatadir)/extensions/cpsection/frame
 
 sugar_PYTHON = 		\
 	__init__.py	\
diff --git a/src/jarabe/controlpanel/frame/__init__.py b/extensions/cpsection/frame/__init__.py
index a93f9c7..a93f9c7 100644
--- a/src/jarabe/controlpanel/frame/__init__.py
+++ b/extensions/cpsection/frame/__init__.py
diff --git a/src/jarabe/controlpanel/frame/model.py b/extensions/cpsection/frame/model.py
index 0e19703..0e19703 100644
--- a/src/jarabe/controlpanel/frame/model.py
+++ b/extensions/cpsection/frame/model.py
diff --git a/src/jarabe/controlpanel/frame/view.py b/extensions/cpsection/frame/view.py
index 7ab7bd2..7ab7bd2 100644
--- a/src/jarabe/controlpanel/frame/view.py
+++ b/extensions/cpsection/frame/view.py
diff --git a/src/jarabe/controlpanel/language/Makefile.am b/extensions/cpsection/language/Makefile.am
index ed8992c..ed8992c 100644
--- a/src/jarabe/controlpanel/language/Makefile.am
+++ b/extensions/cpsection/language/Makefile.am
diff --git a/src/jarabe/controlpanel/language/__init__.py b/extensions/cpsection/language/__init__.py
index a8f9f08..a8f9f08 100644
--- a/src/jarabe/controlpanel/language/__init__.py
+++ b/extensions/cpsection/language/__init__.py
diff --git a/src/jarabe/controlpanel/language/model.py b/extensions/cpsection/language/model.py
index 404d9dd..404d9dd 100644
--- a/src/jarabe/controlpanel/language/model.py
+++ b/extensions/cpsection/language/model.py
diff --git a/src/jarabe/controlpanel/language/view.py b/extensions/cpsection/language/view.py
index 71a185f..71a185f 100644
--- a/src/jarabe/controlpanel/language/view.py
+++ b/extensions/cpsection/language/view.py
diff --git a/src/jarabe/controlpanel/aboutme/Makefile.am b/extensions/cpsection/network/Makefile.am
index da77593..35fd27c 100644
--- a/src/jarabe/controlpanel/aboutme/Makefile.am
+++ b/extensions/cpsection/network/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/jarabe/controlpanel/aboutme
+sugardir = $(pkgdatadir)/extensions/cpsection/network
 
 sugar_PYTHON = 		\
 	__init__.py	\
diff --git a/src/jarabe/controlpanel/network/__init__.py b/extensions/cpsection/network/__init__.py
index 8fea274..8fea274 100644
--- a/src/jarabe/controlpanel/network/__init__.py
+++ b/extensions/cpsection/network/__init__.py
diff --git a/src/jarabe/controlpanel/network/model.py b/extensions/cpsection/network/model.py
index 101297c..101297c 100644
--- a/src/jarabe/controlpanel/network/model.py
+++ b/extensions/cpsection/network/model.py
diff --git a/src/jarabe/controlpanel/network/view.py b/extensions/cpsection/network/view.py
index 4f4ada7..4f4ada7 100644
--- a/src/jarabe/controlpanel/network/view.py
+++ b/extensions/cpsection/network/view.py
diff --git a/src/jarabe/controlpanel/aboutxo/Makefile.am b/extensions/cpsection/power/Makefile.am
index 77cb5d8..325260c 100644
--- a/src/jarabe/controlpanel/aboutxo/Makefile.am
+++ b/extensions/cpsection/power/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/jarabe/controlpanel/aboutxo
+sugardir = $(pkgdatadir)/extensions/cpsection/power
 
 sugar_PYTHON = 		\
 	__init__.py	\
diff --git a/src/jarabe/controlpanel/power/__init__.py b/extensions/cpsection/power/__init__.py
index 8b2e85f..8b2e85f 100644
--- a/src/jarabe/controlpanel/power/__init__.py
+++ b/extensions/cpsection/power/__init__.py
diff --git a/src/jarabe/controlpanel/power/model.py b/extensions/cpsection/power/model.py
index 47af483..47af483 100644
--- a/src/jarabe/controlpanel/power/model.py
+++ b/extensions/cpsection/power/model.py
diff --git a/src/jarabe/controlpanel/power/view.py b/extensions/cpsection/power/view.py
index 8f1ed56..8f1ed56 100644
--- a/src/jarabe/controlpanel/power/view.py
+++ b/extensions/cpsection/power/view.py
diff --git a/src/jarabe/config.py.in b/src/jarabe/config.py.in
index 5588087..9ae2394 100644
--- a/src/jarabe/config.py.in
+++ b/src/jarabe/config.py.in
@@ -20,5 +20,6 @@ prefix = '@prefix@'
 data_path = '@prefix@/share/sugar/data'
 shell_path = '@prefix@/share/sugar/shell'
 locale_path = '@prefix@/share/locale'
+ext_path = '@prefix@/share/sugar/extensions'
 version = '@SUCROSE_VERSION@'
 
diff --git a/src/jarabe/controlpanel/Makefile.am b/src/jarabe/controlpanel/Makefile.am
index 7d17b4f..fb796d7 100644
--- a/src/jarabe/controlpanel/Makefile.am
+++ b/src/jarabe/controlpanel/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = aboutme aboutxo datetime frame language network power
-
 sugardir = $(pythondir)/jarabe/controlpanel
 sugar_PYTHON = 				\
 	__init__.py			\
diff --git a/src/jarabe/controlpanel/cmd.py b/src/jarabe/controlpanel/cmd.py
index b4b364f..a1eb044 100644
--- a/src/jarabe/controlpanel/cmd.py
+++ b/src/jarabe/controlpanel/cmd.py
@@ -53,13 +53,13 @@ def load_modules():
     '''
     modules = []
 
-    path = os.path.join(config.shell_path, 'controlpanel')
+    path = os.path.join(config.ext_path, 'cpsection')
     folder = os.listdir(path)
 
     for item in folder:
         if os.path.isdir(os.path.join(path, item)) and \
-                os.path.exists(os.path.join(path, item, 'model.py')):
-            module = __import__('.'.join(('controlpanel', item, 'model')), 
+           os.path.exists(os.path.join(path, item, 'model.py')):
+            module = __import__('.'.join(('cpsection', item, 'model')), 
                                 globals(), locals(), ['model'])
             modules.append(module)
             
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 3e18cac..2f48151 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -27,6 +27,7 @@ from sugar.graphics.alert import Alert
 from jarabe.session import get_session_manager
 from jarabe.controlpanel.toolbar import MainToolbar
 from jarabe.controlpanel.toolbar import SectionToolbar
+from jarabe import config
 
 _logger = logging.getLogger('ControlPanel')
 _MAX_COLUMNS = 5
@@ -194,11 +195,11 @@ class ControlPanel(gtk.Window):
 
         self._current_option = option
 
-        mod = __import__('.'.join(('jarabe.controlpanel', option, 'view')), 
+        mod = __import__('.'.join(('cpsection', option, 'view')), 
                          globals(), locals(), ['view']) 
         view_class = getattr(mod, self._options[option]['view'], None)
 
-        mod = __import__('.'.join(('jarabe.controlpanel', option, 'model')), 
+        mod = __import__('.'.join(('cpsection', option, 'model')), 
                          globals(), locals(), ['model'])
         model = ModelWrapper(mod)        
 
@@ -224,13 +225,13 @@ class ControlPanel(gtk.Window):
         '''
         options = {}
 
-        path = os.path.dirname(__file__)
+        path = os.path.join(config.ext_path, 'cpsection')
         folder = os.listdir(path)
 
         for item in folder:
             if os.path.isdir(os.path.join(path, item)) and \
                     os.path.exists(os.path.join(path, item, '__init__.py')):
-                mod = __import__('.'.join(('jarabe.controlpanel', item)), 
+                mod = __import__('.'.join(('cpsection', item)), 
                                  globals(), locals(), [item])
                 view_class = getattr(mod, 'CLASS', None)
                 if view_class is not None: 
diff --git a/src/jarabe/controlpanel/network/Makefile.am b/src/jarabe/controlpanel/network/Makefile.am
deleted file mode 100644
index e480aa3..0000000
--- a/src/jarabe/controlpanel/network/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sugardir = $(pythondir)/jarabe/controlpanel/network
-
-sugar_PYTHON = 		\
-	__init__.py	\
-	model.py	\
-	view.py		
diff --git a/src/jarabe/controlpanel/power/Makefile.am b/src/jarabe/controlpanel/power/Makefile.am
deleted file mode 100644
index e989e97..0000000
--- a/src/jarabe/controlpanel/power/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sugardir = $(pythondir)/jarabe/controlpanel/power
-
-sugar_PYTHON = 		\
-	__init__.py	\
-	model.py	\
-	view.py