Bunch of import fixes

27 files changed, 98 insertions, 88 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
index dbaaa2d..514dfbf 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,6 @@
 bin_SCRIPTS = 			\
 	sugar			\
 	sugar-activity		\
-	sugar-backup		\
 	sugar-control-panel	\
 	sugar-emulator		\
 	sugar-install-bundle	\
@@ -9,7 +8,3 @@ bin_SCRIPTS = 			\
 	sugar-shell		\
 	sugar-shell-service	\
 	sugar-ui-check
-
-EXTRA_DIST = $(bin_SCRIPTS) sugar.in
-
-DISTCLEANFILES = sugar
diff --git a/bin/sugar-control-panel b/bin/sugar-control-panel
index 4f14e77..d72e31a 100644
--- a/bin/sugar-control-panel
+++ b/bin/sugar-control-panel
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from jarube.controlpanel.cmd import main
+from jarabe.controlpanel.cmd import main
 
 main()
 
diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index c42612b..90e0234 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from jarube.emulator import main
+from jarabe.emulator import main
 
 main()
 
diff --git a/bin/sugar-shell b/bin/sugar-shell
index 176196b..00a3864 100644
--- a/bin/sugar-shell
+++ b/bin/sugar-shell
@@ -24,7 +24,7 @@ else:
 
 os.environ['GTK2_RC_FILES'] = '@prefix@/share/sugar/data/%s.gtkrc' % theme
 
-from jarube.main import main
+from jarabe.main import main
 
 main()
 
diff --git a/bin/sugar-ui-check b/bin/sugar-ui-check
index edf0c62..f379bf4 100644
--- a/bin/sugar-ui-check
+++ b/bin/sugar-ui-check
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import jarube.uicheck
+import jarabe.uicheck
 
 uicheck.main()
 
diff --git a/configure.ac b/configure.ac
index d63d5af..fef3517 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 AC_CONFIG_FILES([
 bin/sugar-shell-service
 service/config.py
-src/config.py
+src/jarabe/config.py
 ])
 
 AC_OUTPUT([
@@ -41,25 +41,26 @@ bin/Makefile
 data/Makefile
 data/icons/Makefile
 service/Makefile
-src/jarube/Makefile
-src/jarube/controlpanel/Makefile
-src/jarube/controlpanel/aboutme/Makefile
-src/jarube/controlpanel/aboutxo/Makefile
-src/jarube/controlpanel/datetime/Makefile
-src/jarube/controlpanel/frame/Makefile
-src/jarube/controlpanel/language/Makefile
-src/jarube/controlpanel/network/Makefile
-src/jarube/controlpanel/power/Makefile
-src/jarube/intro/Makefile
-src/jarube/journal/Makefile
-src/jarube/hardware/Makefile
-src/jarube/view/Makefile
-src/jarube/view/devices/Makefile
-src/jarube/view/devices/network/Makefile
-src/jarube/view/frame/Makefile
-src/jarube/view/home/Makefile
-src/jarube/model/Makefile
-src/jarube/model/devices/Makefile
-src/jarube/model/devices/network/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/intro/Makefile
+src/jarabe/journal/Makefile
+src/jarabe/hardware/Makefile
+src/jarabe/view/Makefile
+src/jarabe/view/devices/Makefile
+src/jarabe/view/devices/network/Makefile
+src/jarabe/view/frame/Makefile
+src/jarabe/view/home/Makefile
+src/jarabe/model/Makefile
+src/jarabe/model/devices/Makefile
+src/jarabe/model/devices/network/Makefile
 po/Makefile.in
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..83571a4
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = jarabe
diff --git a/src/jarabe/Makefile.am b/src/jarabe/Makefile.am
index 83571a4..17c3838 100644
--- a/src/jarabe/Makefile.am
+++ b/src/jarabe/Makefile.am
@@ -1 +1,14 @@
-SUBDIRS = jarabe
+SUBDIRS = controlpanel hardware journal model view intro
+
+sugardir = $(pythondir)/jarabe
+sugar_PYTHON =			\
+        __init__.py		\
+	config.py           	\
+	emulator.py		\
+	logsmanager.py		\
+	main.py			\
+	session.py		\
+	shellservice.py		\
+	uicheck.py
+
+EXTRA_DIST = $(bin_SCRIPTS) $(conf_DATA)
diff --git a/src/jarabe/controlpanel/aboutxo/view.py b/src/jarabe/controlpanel/aboutxo/view.py
index e18d38d..a3afa10 100644
--- a/src/jarabe/controlpanel/aboutxo/view.py
+++ b/src/jarabe/controlpanel/aboutxo/view.py
@@ -18,7 +18,7 @@
 import gtk
 from gettext import gettext as _
 
-import config
+from jarabe import config
 from sugar.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
diff --git a/src/jarabe/controlpanel/cmd.py b/src/jarabe/controlpanel/cmd.py
index 8e41af5..b4b364f 100644
--- a/src/jarabe/controlpanel/cmd.py
+++ b/src/jarabe/controlpanel/cmd.py
@@ -19,7 +19,7 @@ import getopt
 import os
 from gettext import gettext as _
 
-import config
+from jarabe import config
 
 _RESTART = 1
 
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index a0e4498..98524cd 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -23,9 +23,9 @@ from gettext import gettext as _
 from sugar.graphics.icon import Icon
 from sugar.graphics import style
 from sugar.graphics.alert import Alert
-import config 
-from session import get_session_manager
 
+from jarabe import config 
+from jarabe.session import get_session_manager
 from jarabe.controlpanel.toolbar import MainToolbar
 from jarabe.controlpanel.toolbar import SectionToolbar
 
diff --git a/src/jarabe/main.py b/src/jarabe/main.py
index b8fab9b..b4aae12 100644
--- a/src/jarabe/main.py
+++ b/src/jarabe/main.py
@@ -29,14 +29,14 @@ dbus.glib.threads_init()
 from sugar import logger
 from sugar.profile import get_profile
 
-import view.Shell
+from jarabe.view import Shell
 from shellservice import ShellService
 from jarabe.hardware import hardwaremanager
 from jarabe.intro.window import IntroWindow
 from jarabe.intro.window import create_profile
 from session import get_session_manager
-import logsmanager
-import config
+from jarabe import logsmanager
+from jarabe import config
 
 def _start_matchbox():
     cmd = ['matchbox-window-manager']
@@ -73,7 +73,7 @@ def _shell_started_cb():
 def _software_update_cb():
     '''Ask the homeview to display an alert about available software updates
     '''
-    shell = view.Shell.get_instance()
+    shell = Shell.get_instance()
     home_box = shell.home_window.get_home_box()
     home_box.show_software_updates_alert()
 
@@ -140,7 +140,7 @@ def main():
                     break
 
     # TODO: move initializations from the Shell constructor to a start() method
-    view.Shell.get_instance()
+    Shell.get_instance()
     ShellService()
 
     session_manager = get_session_manager()
diff --git a/src/jarabe/model/homeactivity.py b/src/jarabe/model/homeactivity.py
index ba0979e..6c90692 100644
--- a/src/jarabe/model/homeactivity.py
+++ b/src/jarabe/model/homeactivity.py
@@ -26,7 +26,7 @@ from sugar.presence import presenceservice
 from sugar import profile
 from sugar import wm
 
-import config
+from jarabe import config
 
 _SERVICE_NAME = "org.laptop.Activity"
 _SERVICE_PATH = "/org/laptop/Activity"
diff --git a/src/jarabe/uicheck.py b/src/jarabe/uicheck.py
index aebe990..ff340b5 100644
--- a/src/jarabe/uicheck.py
+++ b/src/jarabe/uicheck.py
@@ -27,7 +27,7 @@ import wnck
 from sugar import wm
 
 from jarabe.model.homemodel import get_sugar_window_type
-import config
+from jarabe import config
 
 checks_queue = []
 checks_failed = []
diff --git a/src/jarabe/view/BuddyMenu.py b/src/jarabe/view/BuddyMenu.py
index 2f7a048..bb2af0d 100644
--- a/src/jarabe/view/BuddyMenu.py
+++ b/src/jarabe/view/BuddyMenu.py
@@ -23,7 +23,7 @@ from sugar.graphics.menuitem import MenuItem
 from sugar.graphics.icon import Icon
 
 from jarabe.model import shellmodel
-import view.Shell
+from jarabe.view import Shell
 
 class BuddyMenu(Palette):
     def __init__(self, buddy):
@@ -116,6 +116,6 @@ class BuddyMenu(Palette):
         friends.remove(self._buddy)
 
     def _invite_friend_cb(self, menuitem):
-        activity = view.Shell.get_instance().get_current_activity()
+        activity = Shell.get_instance().get_current_activity()
         activity.invite(self._buddy)
 
diff --git a/src/jarabe/view/Shell.py b/src/jarabe/view/Shell.py
index 089bfb5..8f015b4 100644
--- a/src/jarabe/view/Shell.py
+++ b/src/jarabe/view/Shell.py
@@ -34,9 +34,6 @@ from sugar import profile
 from sugar import env
 
 from jarabe.view.ActivityHost import ActivityHost
-from jarabe.view.frame import frame
-from jarabe.view.keyhandler import KeyHandler
-from jarabe.view.home.HomeWindow import HomeWindow
 from jarabe.view.launchwindow import LaunchWindow
 from jarabe.model import shellmodel
 from jarabe.journal import journalactivity
@@ -58,10 +55,13 @@ class Shell(gobject.GObject):
         self._screen = wnck.screen_get_default()
         self._screen_rotation = 0
 
+        from jarabe.view.keyhandler import KeyHandler
         self._key_handler = KeyHandler()
 
+        from jarabe.view.frame import frame
         self._frame = frame.get_instance()
 
+        from jarabe.view.home.HomeWindow import HomeWindow
         self.home_window = HomeWindow()
         self.home_window.show()
 
diff --git a/src/jarabe/view/clipboardicon.py b/src/jarabe/view/clipboardicon.py
index bd5d00e..a2b4193 100644
--- a/src/jarabe/view/clipboardicon.py
+++ b/src/jarabe/view/clipboardicon.py
@@ -27,7 +27,7 @@ from jarabe.model import clipboard
 from jarabe.view.clipboardmenu import ClipboardMenu
 from jarabe.view.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.view.frame.notification import NotificationIcon
-import view.frame.frame
+import jarabe.view.frame.frame
 
 class ClipboardIcon(RadioToolButton):
     __gtype_name__ = 'SugarClipboardIcon'
@@ -123,9 +123,9 @@ class ClipboardIcon(RadioToolButton):
             self._notif_icon.props.xo_color = \
                     XoColor('%s,%s' % (self._icon.props.stroke_color,
                                        self._icon.props.fill_color))
-            frame = view.frame.frame.get_instance()
+            frame = jarabe.view.frame.frame.get_instance()
             frame.add_notification(self._notif_icon, 
-                                   view.frame.frame.BOTTOM_LEFT)
+                                   jarabe.view.frame.frame.BOTTOM_LEFT)
         self._current_percent = cb_object.get_percent()
 
     def _notify_active_cb(self, widget, pspec):
diff --git a/src/jarabe/view/clipboardmenu.py b/src/jarabe/view/clipboardmenu.py
index cacdef0..990379b 100644
--- a/src/jarabe/view/clipboardmenu.py
+++ b/src/jarabe/view/clipboardmenu.py
@@ -31,7 +31,7 @@ from sugar import profile
 from sugar import activity
 
 from jarabe.model import clipboard
-import journal.misc
+from jarabe.journal import misc
 
 class ClipboardMenu(Palette):
 
@@ -164,7 +164,7 @@ class ClipboardMenu(Palette):
         if percent < 100 or menu_item.get_submenu() is not None:
             return
         jobject = self._copy_to_journal()
-        journal.misc.resume(jobject, self._activities[0])
+        misc.resume(jobject, self._activities[0])
         jobject.destroy()
 
     def _open_submenu_item_activate_cb(self, menu_item, service_name):
@@ -173,7 +173,7 @@ class ClipboardMenu(Palette):
         if percent < 100:
             return
         jobject = self._copy_to_journal()
-        journal.misc.resume(jobject, service_name)
+        misc.resume(jobject, service_name)
         jobject.destroy()
 
     def _remove_item_activate_cb(self, menu_item):
diff --git a/src/jarabe/view/frame/activitiestray.py b/src/jarabe/view/frame/activitiestray.py
index 735fa96..76b0a33 100644
--- a/src/jarabe/view/frame/activitiestray.py
+++ b/src/jarabe/view/frame/activitiestray.py
@@ -35,7 +35,7 @@ from jarabe.view.palettes import JournalPalette, CurrentActivityPalette
 from jarabe.view.pulsingicon import PulsingIcon
 from jarabe.view.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.view.frame.notification import NotificationIcon
-import view.frame.frame
+import jarabe.view.frame.frame
 
 class ActivityButton(RadioToolButton):
     def __init__(self, home_activity, group):
@@ -94,7 +94,7 @@ class BaseInviteButton(ToolButton):
 
     def __clicked_cb(self, button):
         if self._notif_icon is not None:
-            frame = view.frame.frame.get_instance()
+            frame = jarabe.view.frame.frame.get_instance()
             frame.remove_notification(self._notif_icon)
             self._notif_icon = None
             self._launch()
@@ -104,7 +104,7 @@ class BaseInviteButton(ToolButton):
         raise NotImplementedError
 
     def __destroy_cb(self, button):
-        frame = view.frame.frame.get_instance()
+        frame = jarabe.view.frame.frame.get_instance()
         frame.remove_notification(self._notif_icon)
 
 class ActivityInviteButton(BaseInviteButton):
@@ -141,13 +141,13 @@ class ActivityInviteButton(BaseInviteButton):
         palette.set_group_id('frame')
         self._notif_icon.palette = palette
 
-        frame = view.frame.frame.get_instance()
+        frame = jarabe.view.frame.frame.get_instance()
         frame.add_notification(self._notif_icon,
-                               view.frame.frame.TOP_LEFT)
+                               jarabe.view.frame.frame.TOP_LEFT)
 
     def _launch(self):
         """Join the activity in the invite."""
-        shell = view.Shell.get_instance()
+        shell = Shell.get_instance()
         shell.join_activity(self._activity_model.get_bundle_id(),
                             self._activity_model.get_id())
 
@@ -187,13 +187,13 @@ class PrivateInviteButton(BaseInviteButton):
         palette.set_group_id('frame')
         self._notif_icon.palette = palette
 
-        frame = view.frame.frame.get_instance()
+        frame = jarabe.view.frame.frame.get_instance()
         frame.add_notification(self._notif_icon,
-                               view.frame.frame.TOP_LEFT)
+                               jarabe.view.frame.frame.TOP_LEFT)
 
     def _launch(self):
         """Start the activity with private channel."""
-        shell = view.Shell.get_instance()
+        shell = Shell.get_instance()
         shell.start_activity_with_uri(self._bundle_id,
                                       self._private_channel)
 
@@ -245,7 +245,7 @@ class ActivityInvitePalette(BaseInvitePalette):
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        shell = view.Shell.get_instance()
+        shell = Shell.get_instance()
         shell.join_activity(self._activity_model.get_bundle_id(),
                             self._activity_model.get_id())
 
@@ -272,7 +272,7 @@ class PrivateInvitePalette(BaseInvitePalette):
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        shell = view.Shell.get_instance()
+        shell = Shell.get_instance()
         shell.start_activity_with_uri(self._bundle_id,
                                       self._private_channel)
         invites = shellmodel.get_instance().get_invites()
diff --git a/src/jarabe/view/frame/friendstray.py b/src/jarabe/view/frame/friendstray.py
index 93d023e..fe9b648 100644
--- a/src/jarabe/view/frame/friendstray.py
+++ b/src/jarabe/view/frame/friendstray.py
@@ -17,7 +17,7 @@
 from sugar.presence import presenceservice
 from sugar.graphics.tray import VTray, TrayIcon
 
-import view.Shell
+from jarabe.view import Shell
 from jarabe.view.BuddyMenu import BuddyMenu
 from jarabe.view.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import shellmodel
@@ -87,7 +87,7 @@ class FriendsTray(VTray):
         self._buddies = {}
 
     def __activity_appeared_cb(self, pservice, activity_ps):
-        activity = view.Shell.get_instance().get_current_activity()
+        activity = Shell.get_instance().get_current_activity()
         if activity and activity_ps.props.id == activity.get_id():
             self._set_activity_ps(activity_ps, True)
 
diff --git a/src/jarabe/view/frame/zoomtoolbar.py b/src/jarabe/view/frame/zoomtoolbar.py
index 8829790..eba5606 100644
--- a/src/jarabe/view/frame/zoomtoolbar.py
+++ b/src/jarabe/view/frame/zoomtoolbar.py
@@ -22,7 +22,7 @@ import gtk
 from sugar.graphics.palette import Palette
 from sugar.graphics.radiotoolbutton import RadioToolButton
 
-import view.Shell
+from jarabe.view import Shell
 from jarabe.view.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import shellmodel
 
@@ -68,7 +68,7 @@ class ZoomToolbar(gtk.Toolbar):
         if not button.get_active():
             return
         if shellmodel.get_instance().props.zoom_level != level:
-            view.Shell.get_instance().set_zoom_level(level)
+            Shell.get_instance().set_zoom_level(level)
 
     def __notify_zoom_level_cb(self, model, pspec):
         self._set_zoom_level(model.props.zoom_level)
diff --git a/src/jarabe/view/home/MeshBox.py b/src/jarabe/view/home/MeshBox.py
index f94b930..36b837e 100644
--- a/src/jarabe/view/home/MeshBox.py
+++ b/src/jarabe/view/home/MeshBox.py
@@ -39,7 +39,7 @@ from jarabe.view.BuddyIcon import BuddyIcon
 from jarabe.view.pulsingicon import CanvasPulsingIcon
 from jarabe.view.home.snowflakelayout import SnowflakeLayout
 from jarabe.view.home.spreadlayout import SpreadLayout
-import view.Shell
+from jarabe.view import Shell
 
 from jarabe.hardware.nmclient import NM_802_11_CAP_PROTO_WEP, \
     NM_802_11_CAP_PROTO_WPA, NM_802_11_CAP_PROTO_WPA2
@@ -336,7 +336,7 @@ class ActivityView(hippo.CanvasBox):
 
     def _clicked_cb(self, item):
         bundle_id = self._model.get_bundle_id()
-        view.Shell.get_instance().join_activity(bundle_id, self._model.get_id())
+        Shell.get_instance().join_activity(bundle_id, self._model.get_id())
 
     def set_filter(self, query):
         text_to_check = self._model.activity.props.name.lower() + \
diff --git a/src/jarabe/view/home/activitieslist.py b/src/jarabe/view/home/activitieslist.py
index 54bd023..3e6d2e7 100644
--- a/src/jarabe/view/home/activitieslist.py
+++ b/src/jarabe/view/home/activitieslist.py
@@ -24,7 +24,7 @@ from sugar import util
 from sugar.graphics import style
 from sugar.graphics.icon import CanvasIcon
 
-import view.Shell
+from jarabe.view import Shell
 from jarabe.view.palettes import ActivityPalette
 
 class ActivitiesList(gtk.VBox):
@@ -248,7 +248,7 @@ class ActivityEntry(hippo.CanvasBox, hippo.CanvasItem):
             self._favorite_icon.props.favorite = self._favorite
 
     def __icon_button_release_event_cb(self, icon, event):
-        view.Shell.get_instance().start_activity(self._bundle_id)
+        Shell.get_instance().start_activity(self._bundle_id)
 
     def get_bundle_id(self):
         return self._bundle_id
diff --git a/src/jarabe/view/home/favoritesview.py b/src/jarabe/view/home/favoritesview.py
index 3dae714..71a49bf 100644
--- a/src/jarabe/view/home/favoritesview.py
+++ b/src/jarabe/view/home/favoritesview.py
@@ -30,7 +30,7 @@ from sugar.graphics.alert import Alert
 from sugar.profile import get_profile
 from sugar import activity
 
-import view.Shell
+from jarabe.view import Shell
 from jarabe.view.palettes import JournalPalette
 from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette
 from jarabe.view.home.MyIcon import MyIcon
@@ -39,7 +39,7 @@ from jarabe.model import shellmodel
 from jarabe.hardware import schoolserver
 from jarabe.hardware.schoolserver import RegisterError
 from jarabe.controlpanel.gui import ControlPanel
-from session import get_session_manager
+from jarabe.session import get_session_manager
 
 _logger = logging.getLogger('FavoritesView')
 
@@ -349,7 +349,7 @@ class ActivityIcon(CanvasIcon):
     def __button_release_event_cb(self, icon, event):
         self.palette.popdown(immediate=True)
         self._uncolor()
-        view.Shell.get_instance().start_activity(self._activity_info.bundle_id)
+        Shell.get_instance().start_activity(self._activity_info.bundle_id)
 
     def get_bundle_id(self):
         return self._activity_info.bundle_id
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index d6b7565..4d9f8e8 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -26,7 +26,7 @@ import gtk
 from sugar._sugarext import KeyGrabber
 
 from jarabe.hardware import hardwaremanager
-import view.Shell
+from jarabe.view import Shell
 from jarabe.view.tabbinghandler import TabbingHandler
 from jarabe.model.shellmodel import ShellModel
 
@@ -148,19 +148,19 @@ class KeyHandler(object):
         self._tabbing_handler.next_activity()
 
     def handle_close_window(self):
-        view.Shell.get_instance().close_current_activity()
+        Shell.get_instance().close_current_activity()
 
     def handle_zoom_mesh(self):
-        view.Shell.get_instance().set_zoom_level(ShellModel.ZOOM_MESH)
+        Shell.get_instance().set_zoom_level(ShellModel.ZOOM_MESH)
 
     def handle_zoom_friends(self):
-        view.Shell.get_instance().set_zoom_level(ShellModel.ZOOM_FRIENDS)
+        Shell.get_instance().set_zoom_level(ShellModel.ZOOM_FRIENDS)
 
     def handle_zoom_home(self):
-        view.Shell.get_instance().set_zoom_level(ShellModel.ZOOM_HOME)
+        Shell.get_instance().set_zoom_level(ShellModel.ZOOM_HOME)
 
     def handle_zoom_activity(self):
-        view.Shell.get_instance().set_zoom_level(ShellModel.ZOOM_ACTIVITY)
+        Shell.get_instance().set_zoom_level(ShellModel.ZOOM_ACTIVITY)
 
     def handle_brightness_max(self):
         self._change_brightness(value=_BRIGHTNESS_MAX)
@@ -187,10 +187,10 @@ class KeyHandler(object):
         self._change_volume(step=-_VOLUME_STEP)
 
     def handle_screenshot(self):
-        view.Shell.get_instance().take_screenshot()
+        Shell.get_instance().take_screenshot()
 
     def handle_frame(self):
-        view.Shell.get_instance().get_frame().notify_key_press()
+        Shell.get_instance().get_frame().notify_key_press()
 
 
     def handle_rotate(self):
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 416ff0f..5f41231 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -30,7 +30,7 @@ from sugar.graphics.icon import Icon
 from sugar.graphics import style
 from sugar.graphics.xocolor import XoColor
 
-import view.Shell
+from jarabe.view import Shell
 
 class BasePalette(Palette):
     def __init__(self, home_activity):
@@ -145,7 +145,7 @@ class ActivityPalette(Palette):
         self._favorite_icon.props.xo_color = xo_color
 
     def __start_activate_cb(self, menu_item):
-        view.Shell.get_instance().start_activity(self._bundle_id)
+        Shell.get_instance().start_activity(self._bundle_id)
 
     def __change_favorite_activate_cb(self, menu_item):
         registry = activity.get_registry()
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index f1df2e3..f858fd6 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -18,7 +18,7 @@ import logging
 import gtk
 import gobject
 
-import view.Shell
+from jarabe.view import Shell
 from jarabe.view.frame import frame
 from jarabe.model import shellmodel
 
@@ -102,7 +102,7 @@ class TabbingHandler(object):
             home_model.set_tabbing_activity(activity)
             self._start_timeout()
         else:
-            view.Shell.get_instance().activate_next_activity()
+            Shell.get_instance().activate_next_activity()
 
     def previous_activity(self):
         if not self._tabbing:
@@ -126,7 +126,7 @@ class TabbingHandler(object):
             home_model.set_tabbing_activity(activity)
             self._start_timeout()
         else:
-            view.Shell.get_instance().activate_next_activity()
+            Shell.get_instance().activate_next_activity()
 
     def stop(self):
         gtk.gdk.keyboard_ungrab()