diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index ac6855d2f..6ee94f3ac 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -5,14 +5,12 @@
 
 #src
 src/AutoComp.py
-src/Date.py
 src/DdTargets.py
 src/Errors.py
 src/glade.py
 src/GrampsDisplay.py
 src/ImgManip.py
 src/ListModel.py
-src/ManagedWindow.py
 src/RecentFiles.py
 src/Sort.py
 src/soundex.py
@@ -232,6 +230,7 @@ src/gen/utils/callman.py
 # gui - GUI code
 src/gui/__init__.py
 src/gui/dbguielement.py
+src/managedwindow.py
 src/gui/navigator.py
 src/gui/pluginmanager.py
 src/gui/user.py
diff --git a/src/DateEdit.py b/src/DateEdit.py
index 6e01ddc45..d68bb01ab 100644
--- a/src/DateEdit.py
+++ b/src/DateEdit.py
@@ -66,7 +66,7 @@ from gen.lib.date import Date, NextYear
 import gen.datehandler
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from Errors import ValidationError
 from glade import Glade
 
@@ -179,7 +179,7 @@ class DateEdit(object):
 # DateEditorDialog
 #
 #-------------------------------------------------------------------------
-class DateEditorDialog(ManagedWindow.ManagedWindow):
+class DateEditorDialog(ManagedWindow):
     """
     Dialog allowing to build the date precisely, to correct possible 
     limitations of parsing and/or underlying structure of Date.
@@ -189,7 +189,7 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
         """
         Initiate and display the dialog.
         """
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
         
         # Create self.date as a copy of the given Date object.
         self.date = Date(date)
diff --git a/src/DisplayState.py b/src/DisplayState.py
index 323b22381..fa644258e 100644
--- a/src/DisplayState.py
+++ b/src/DisplayState.py
@@ -58,7 +58,7 @@ from gui.utils import process_pending_events
 from gui.views.navigationview import NavigationView
 import config
 from gen.display.name import displayer as name_displayer
-import ManagedWindow
+from gui.managedwindow import GrampsWindowManager
 import Relationship
 from glade import Glade
 from Utils import navigation_label
@@ -385,7 +385,7 @@ class DisplayState(gen.utils.Callback):
         self.status_id = status.get_context_id('GRAMPS')
         self.progress = progress
         self.history_lookup = {}
-        self.gwm = ManagedWindow.GrampsWindowManager(uimanager)
+        self.gwm = GrampsWindowManager(uimanager)
         self.widget = None
         self.disprel_old = ''
         self.disprel_defpers = None
diff --git a/src/ExportAssistant.py b/src/ExportAssistant.py
index c30c36340..20b0c1017 100644
--- a/src/ExportAssistant.py
+++ b/src/ExportAssistant.py
@@ -59,7 +59,7 @@ import const
 import config
 from gui.pluginmanager import GuiPluginManager
 import Utils
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import ErrorDialog
 from gui.user import User
 
@@ -86,7 +86,7 @@ _ExportAssistant_pages = {
             'summary'                : 5,
             }
 
-class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
+class ExportAssistant(gtk.Assistant, ManagedWindow) :
     """
     This class creates a GTK assistant to guide the user through the various
     Save as/Export options. 
@@ -124,10 +124,10 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
         
         #set up ManagedWindow
         self.top_title = _("Export Assistant")
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],
+        ManagedWindow.__init__(self,uistate,[],
                                                  self.__class__)
         #set_window is present in both parent classes
-        ManagedWindow.ManagedWindow.set_window(self, self, None,
+        ManagedWindow.set_window(self, self, None,
             self.top_title, isWindow=True)        
 
         #set up callback method for the export plugins
@@ -168,7 +168,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
         self.set_forward_page_func(self.forward_func, None)
         
         #ManagedWindow show method
-        ManagedWindow.ManagedWindow.show(self)
+        ManagedWindow.show(self)
 
     def get_forward_button(self, arg):
         if isinstance(arg, gtk.HBox):
@@ -566,7 +566,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
     def close(self, *obj) :
         #clean up ManagedWindow menu, then destroy window, bring forward parent
         gtk.Assistant.destroy(self)
-        ManagedWindow.ManagedWindow.close(self,*obj)
+        ManagedWindow.close(self,*obj)
 
     def get_intro_text(self):
         return _('Under normal circumstances, Gramps does not require you '
diff --git a/src/Makefile.am b/src/Makefile.am
index 5158d8a60..31ff49b53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@ gdir_PYTHON = \
 	const.py\
         constfunc.py\
 	DateEdit.py\
-	Date.py\
 	DbState.py\
 	DdTargets.py\
 	DisplayState.py\
@@ -35,7 +34,6 @@ gdir_PYTHON = \
 	ListModel.py\
 	Lru.py\
 	MacTransUtils.py\
-	ManagedWindow.py\
 	QuestionDialog.py\
 	RecentFiles.py\
 	Relationship.py\
diff --git a/src/Reorder.py b/src/Reorder.py
index 01ec92057..5571a18a2 100644
--- a/src/Reorder.py
+++ b/src/Reorder.py
@@ -34,20 +34,20 @@ from gen.ggettext import gettext as _
 from gen.db import DbTxn
 from gen.display.name import displayer as name_displayer
 import ListModel
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from glade import Glade
 
 PARENT_TITLES = [(_('Father'), -1, 200), (_('Mother'), -1, 200), ('', -1, 0)]
 FAMILY_TITLES = [(_('Spouse'), -1, 200), (_('Relationship'), -1, 200), ('', -1, 0)]
 
-class Reorder(ManagedWindow.ManagedWindow):
+class Reorder(ManagedWindow):
     
     def __init__(self, state, uistate, track, handle):
         xml = Glade()
         top = xml.toplevel
 
         self.dbstate = state
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.person = self.dbstate.db.get_person_from_handle(handle)
         self.parent_list = self.person.get_parent_family_handle_list()
diff --git a/src/ScratchPad.py b/src/ScratchPad.py
index c4d4ff98f..6978533a6 100644
--- a/src/ScratchPad.py
+++ b/src/ScratchPad.py
@@ -49,7 +49,7 @@ import config
 import gen.lib
 import gen.datehandler
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.ggettext import sgettext as _
 from TransUtils import trans_objclass
 from constfunc import mac
@@ -1267,7 +1267,7 @@ class ScratchPadListView(object):
 # ScratchPadWindow class
 #
 #-------------------------------------------------------------------------
-class ScratchPadWindow(ManagedWindow.ManagedWindow):
+class ScratchPadWindow(ManagedWindow):
     """
         The Clipboard (was ScratchPad) provides a temporary area to hold objects
         that can
@@ -1296,7 +1296,7 @@ class ScratchPadWindow(ManagedWindow.ManagedWindow):
     def __init__(self, dbstate, uistate):
         """Initialize the ScratchPad class, and displays the window"""
 
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
+        ManagedWindow.__init__(self,uistate,[],self.__class__)
         self.dbstate = dbstate
 
         self.database_changed(self.dbstate.db)
diff --git a/src/TipOfDay.py b/src/TipOfDay.py
index 718f4bb7a..d8f871740 100644
--- a/src/TipOfDay.py
+++ b/src/TipOfDay.py
@@ -47,7 +47,7 @@ import os
 #-------------------------------------------------------------------------
 import const
 import config
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import ErrorDialog
 from glade import Glade
 
@@ -56,10 +56,10 @@ from glade import Glade
 # Tip Display class
 #
 #-------------------------------------------------------------------------
-class TipOfDay(ManagedWindow.ManagedWindow):
+class TipOfDay(ManagedWindow):
     def __init__(self, uistate):
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
+        ManagedWindow.__init__(self, uistate, [], self)
         
         xml = Glade()
         window = xml.toplevel
diff --git a/src/UndoHistory.py b/src/UndoHistory.py
index 159502ee9..d52ee64e7 100644
--- a/src/UndoHistory.py
+++ b/src/UndoHistory.py
@@ -45,14 +45,14 @@ import gobject
 #
 #-------------------------------------------------------------------------
 from QuestionDialog import QuestionDialog
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 
 #-------------------------------------------------------------------------
 #
 # UndoHistory class
 #
 #-------------------------------------------------------------------------
-class UndoHistory(ManagedWindow.ManagedWindow):
+class UndoHistory(ManagedWindow):
     """
     The UndoHistory provides a list view with all the editing
     steps available for undo/redo. Selecting a line in the list
@@ -62,7 +62,7 @@ class UndoHistory(ManagedWindow.ManagedWindow):
     def __init__(self, dbstate, uistate):
 
         self.title = _("Undo History")
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.db = dbstate.db
         self.undodb = self.db.undodb
         self.dbstate = dbstate
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index d5723d7af..3ce92a370 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -29,8 +29,9 @@ pkgpython_PYTHON = \
 	filtereditor.py \
 	grampsbar.py \
 	grampsgui.py \
-	navigator.py \
 	makefilter.py \
+	managedwindow.py \
+	navigator.py \
 	pluginmanager.py \
 	user.py \
 	utils.py \
diff --git a/src/gui/columnorder.py b/src/gui/columnorder.py
index 31b96eebd..e9d66628a 100644
--- a/src/gui/columnorder.py
+++ b/src/gui/columnorder.py
@@ -49,7 +49,7 @@ import gobject
 #
 #-------------------------------------------------------------------------
 import const
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from glade import Glade
 
 
diff --git a/src/gui/configure.py b/src/gui/configure.py
index c2920946e..d7dc0f8a6 100644
--- a/src/gui/configure.py
+++ b/src/gui/configure.py
@@ -54,7 +54,7 @@ from gen.display.name import NameDisplayError
 import Utils
 import gen.lib
 from gen.lib import Name, Surname, NameOriginType
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gui.widgets import MarkupLabel, BasicLabel
 from QuestionDialog import ErrorDialog, QuestionDialog2, OkDialog
 from glade import Glade
@@ -83,11 +83,11 @@ COL_EXPL = 3
 #
 #
 #-------------------------------------------------------------------------
-class DisplayNameEditor(ManagedWindow.ManagedWindow):
+class DisplayNameEditor(ManagedWindow):
     def __init__(self, uistate, dbstate, track, dialog):
         # Assumes that there are two methods: dialog.name_changed_check(), 
         # and dialog._build_custom_name_ui() 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], DisplayNameEditor)
+        ManagedWindow.__init__(self, uistate, [], DisplayNameEditor)
         self.dialog = dialog
         self.dbstate = dbstate
         self.set_window(
@@ -124,7 +124,7 @@ UPPERCASE keyword forces uppercase. Extra parentheses, commas are removed. Other
         self.show()
     def close(self, *obj):
         self.dialog.name_changed_check()
-        ManagedWindow.ManagedWindow.close(self, *obj)
+        ManagedWindow.close(self, *obj)
         
     def build_menu_names(self, obj):
         return (_(" Name Editor"), _("Preferences"))
@@ -136,7 +136,7 @@ UPPERCASE keyword forces uppercase. Extra parentheses, commas are removed. Other
 #
 #-------------------------------------------------------------------------
 
-class ConfigureDialog(ManagedWindow.ManagedWindow):
+class ConfigureDialog(ManagedWindow):
     """
     Base class for configuration dialogs. They provide a Notebook, to which 
     pages are added with configuration options, and a Cancel and Save button.
@@ -166,7 +166,7 @@ class ConfigureDialog(ManagedWindow.ManagedWindow):
         """
         self.dbstate = dbstate
         self.__config = configmanager
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], configobj)
+        ManagedWindow.__init__(self, uistate, [], configobj)
         self.set_window(
             gtk.Dialog(dialogtitle, flags=gtk.DIALOG_NO_SEPARATOR, 
                        buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)), 
diff --git a/src/gui/editors/addmedia.py b/src/gui/editors/addmedia.py
index 92d9ddf34..61a1efe02 100644
--- a/src/gui/editors/addmedia.py
+++ b/src/gui/editors/addmedia.py
@@ -56,7 +56,7 @@ import Utils
 import gen.mime
 import ThumbNails
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import ErrorDialog, WarningDialog
 from glade import Glade
 
@@ -65,7 +65,7 @@ from glade import Glade
 # AddMediaObject
 #
 #-------------------------------------------------------------------------
-class AddMediaObject(ManagedWindow.ManagedWindow):
+class AddMediaObject(ManagedWindow):
     """
     Displays the Add Media Dialog window, allowing the user to select
     a file from the file system, while providing a description.
@@ -79,7 +79,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
         The mediaobject is updated with the information, and on save, the 
         callback function is called
         """
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.dbase = dbstate.db
         self.obj = mediaobj
diff --git a/src/gui/editors/editlink.py b/src/gui/editors/editlink.py
index 44fe9421e..038c4485d 100644
--- a/src/gui/editors/editlink.py
+++ b/src/gui/editors/editlink.py
@@ -34,7 +34,7 @@ import re
 #
 #-------------------------------------------------------------------------
 from gen.ggettext import gettext as _
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import GrampsDisplay
 from glade import Glade
 from gen.simple import SimpleAccess
@@ -56,7 +56,7 @@ OBJECT_MAP = {
 # EditLink class
 #
 #-------------------------------------------------------------------------
-class EditLink(ManagedWindow.ManagedWindow):
+class EditLink(ManagedWindow):
 
     def __init__(self, dbstate, uistate, track, url, callback):
         self.url = url
@@ -64,7 +64,7 @@ class EditLink(ManagedWindow.ManagedWindow):
         self.simple_access = SimpleAccess(self.dbstate.db)
         self.callback = callback
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, url)
+        ManagedWindow.__init__(self, uistate, track, url)
 
         self._local_init()
         self._connect_signals()
diff --git a/src/gui/editors/editprimary.py b/src/gui/editors/editprimary.py
index 90f149686..bace8cdb4 100644
--- a/src/gui/editors/editprimary.py
+++ b/src/gui/editors/editprimary.py
@@ -40,7 +40,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import gen.datehandler
 from gen.display.name import displayer as name_displayer
 import config
@@ -50,7 +50,7 @@ from QuestionDialog import SaveDialog
 import gen.lib
 from gui.dbguielement import DbGUIElement
 
-class EditPrimary(ManagedWindow.ManagedWindow, DbGUIElement):
+class EditPrimary(ManagedWindow, DbGUIElement):
 
     QR_CATEGORY = -1
     
@@ -76,7 +76,7 @@ class EditPrimary(ManagedWindow.ManagedWindow, DbGUIElement):
         self.contexteventbox = None
         self.__tabs = []
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, obj)
+        ManagedWindow.__init__(self, uistate, track, obj)
         DbGUIElement.__init__(self, self.db)
 
         self._local_init()
@@ -183,7 +183,7 @@ class EditPrimary(ManagedWindow.ManagedWindow, DbGUIElement):
         self._cleanup_on_exit()
         self.get_from_handle = None
         self.get_from_gramps_id = None
-        ManagedWindow.ManagedWindow.close(self)
+        ManagedWindow.close(self)
         self.dbstate = None
         self.uistate = None
         self.db = None
diff --git a/src/gui/editors/editreference.py b/src/gui/editors/editreference.py
index 730da2ca4..0947b1817 100644
--- a/src/gui/editors/editreference.py
+++ b/src/gui/editors/editreference.py
@@ -33,7 +33,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from displaytabs import GrampsTab
 import config
 from gui.dbguielement import DbGUIElement
@@ -86,7 +86,7 @@ class RefTab(GrampsTab):
 # EditReference class
 #
 #-------------------------------------------------------------------------
-class EditReference(ManagedWindow.ManagedWindow, DbGUIElement):
+class EditReference(ManagedWindow, DbGUIElement):
 
     def __init__(self, state, uistate, track, source, source_ref, update):
         self.db = state.db
@@ -99,7 +99,7 @@ class EditReference(ManagedWindow.ManagedWindow, DbGUIElement):
         self.warn_box = None
         self.__tabs = []
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, source_ref)
+        ManagedWindow.__init__(self, uistate, track, source_ref)
         DbGUIElement.__init__(self, self.db)
 
         self._local_init()
@@ -224,7 +224,7 @@ class EditReference(ManagedWindow.ManagedWindow, DbGUIElement):
     def close(self,*obj):
         self._cleanup_db_connects()
         self._cleanup_connects()
-        ManagedWindow.ManagedWindow.close(self)
+        ManagedWindow.close(self)
         self._cleanup_on_exit()
 
     def _cleanup_db_connects(self):
diff --git a/src/gui/editors/editsecondary.py b/src/gui/editors/editsecondary.py
index 4f9d78ec1..34a7ec44a 100644
--- a/src/gui/editors/editsecondary.py
+++ b/src/gui/editors/editsecondary.py
@@ -21,12 +21,12 @@
 
 # $Id$
 
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import GrampsDisplay
 import config
 from gui.dbguielement import DbGUIElement
 
-class EditSecondary(ManagedWindow.ManagedWindow, DbGUIElement):
+class EditSecondary(ManagedWindow, DbGUIElement):
 
     def __init__(self, state, uistate, track, obj, callback=None):
         """Create an edit window.  Associates a person with the window."""
@@ -39,7 +39,7 @@ class EditSecondary(ManagedWindow.ManagedWindow, DbGUIElement):
         self.callback = callback
         self.__tabs = []
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, obj)
+        ManagedWindow.__init__(self, uistate, track, obj)
         DbGUIElement.__init__(self, self.db)
 
         self._local_init()
@@ -143,7 +143,7 @@ class EditSecondary(ManagedWindow.ManagedWindow, DbGUIElement):
     def close(self, *obj):
         self._cleanup_db_connects()
         self._cleanup_connects()
-        ManagedWindow.ManagedWindow.close(self)
+        ManagedWindow.close(self)
         self._cleanup_on_exit()
 
     def _cleanup_db_connects(self):
diff --git a/src/gui/filtereditor.py b/src/gui/filtereditor.py
index c0af1bae0..14f957200 100644
--- a/src/gui/filtereditor.py
+++ b/src/gui/filtereditor.py
@@ -57,7 +57,7 @@ from gen.filters import (GenericFilterFactory, FilterList,
                          reload_custom_filters)
 from gen.filters.rules._matchesfilterbase import MatchesFilterBase
 import ListModel
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import QuestionDialog
 import const
 import GrampsDisplay
@@ -427,10 +427,10 @@ class MyEntry(gtk.Entry):
 # EditRule
 #
 #-------------------------------------------------------------------------
-class EditRule(ManagedWindow.ManagedWindow):
+class EditRule(ManagedWindow):
     def __init__(self, namespace, dbstate, uistate, track, filterdb, val,
                  label, update, filter_name):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, EditRule)
+        ManagedWindow.__init__(self, uistate, track, EditRule)
         self.width_key = "interface.edit-rule-width"
         self.height_key = "interface.edit-rule-height"
         self.namespace = namespace
@@ -714,12 +714,12 @@ class EditRule(ManagedWindow.ManagedWindow):
 # EditFilter
 #
 #-------------------------------------------------------------------------
-class EditFilter(ManagedWindow.ManagedWindow):
+class EditFilter(ManagedWindow):
     
     def __init__(self, namespace, dbstate, uistate, track, gfilter,
                  filterdb, update=None, selection_callback=None):
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
         self.width_key = "interface.edit-filter-width"
         self.height_key = "interface.edit-filter-height"
         self.namespace = namespace
@@ -872,10 +872,10 @@ class EditFilter(ManagedWindow.ManagedWindow):
 # ShowResults
 #
 #-------------------------------------------------------------------------
-class ShowResults(ManagedWindow.ManagedWindow):
+class ShowResults(ManagedWindow):
     def __init__(self, db, uistate, track, handle_list, filtname, namespace):
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.db = db
         self.filtname = filtname
@@ -981,10 +981,10 @@ class ShowResults(ManagedWindow.ManagedWindow):
 # FilterEditor
 #
 #-------------------------------------------------------------------------
-class FilterEditor(ManagedWindow.ManagedWindow):
+class FilterEditor(ManagedWindow):
     def __init__(self, namespace, filterdb, dbstate, uistate):
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], FilterEditor)
+        ManagedWindow.__init__(self, uistate, [], FilterEditor)
         self.dbstate = dbstate
         self.db = dbstate.db
         self.filterdb = FilterList(filterdb)
@@ -1054,7 +1054,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
         reload_custom_filters()
         #reload_system_filters()
         self.uistate.emit('filters-changed', (self.namespace,))
-        ManagedWindow.ManagedWindow.close(self, *obj)
+        ManagedWindow.close(self, *obj)
         
     def draw_filters(self):
         self.clist.clear()
diff --git a/src/gui/grampsbar.py b/src/gui/grampsbar.py
index 083552542..321bbfa3f 100644
--- a/src/gui/grampsbar.py
+++ b/src/gui/grampsbar.py
@@ -47,7 +47,7 @@ import gtk
 #-------------------------------------------------------------------------
 import ConfigParser
 import const
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import GrampsDisplay
 from gui.widgets.grampletpane import (AVAILABLE_GRAMPLETS,
                                       GET_AVAILABLE_GRAMPLETS,
@@ -551,7 +551,7 @@ class TabGramplet(gtk.ScrolledWindow, GuiGramplet):
 # DetachedWindow class
 #
 #-------------------------------------------------------------------------
-class DetachedWindow(ManagedWindow.ManagedWindow):
+class DetachedWindow(ManagedWindow):
     """
     Class for showing a detached gramplet.
     """
@@ -563,7 +563,7 @@ class DetachedWindow(ManagedWindow.ManagedWindow):
         self.grampsbar = grampsbar
         self.gramplet = gramplet
 
-        ManagedWindow.ManagedWindow.__init__(self, gramplet.uistate, [],
+        ManagedWindow.__init__(self, gramplet.uistate, [],
                                              self.title)
         self.set_window(gtk.Dialog("", gramplet.uistate.window,
                                    gtk.DIALOG_DESTROY_WITH_PARENT,
@@ -627,4 +627,4 @@ class DetachedWindow(ManagedWindow.ManagedWindow):
         self.gramplet.detached_height = size[1]
         self.gramplet.detached_window = None
         self.gramplet.reparent(self.grampsbar)
-        ManagedWindow.ManagedWindow.close(self, *args)
+        ManagedWindow.close(self, *args)
diff --git a/src/ManagedWindow.py b/src/gui/managedwindow.py
similarity index 97%
rename from src/ManagedWindow.py
rename to src/gui/managedwindow.py
index b840b4740..15cd41573 100644
--- a/src/ManagedWindow.py
+++ b/src/gui/managedwindow.py
@@ -321,18 +321,18 @@ class ManagedWindow(object):
         The usage from derived classes is envisioned as follows:
         
         
-        import ManagedWindow
-        class SomeWindowClass(ManagedWindow.ManagedWindow):
+        from gui.managedwindow import ManagedWindow
+        class SomeWindowClass(ManagedWindow):
             def __init__(self,uistate,dbstate,track):
                 window_id = self        # Or e.g. window_id = person.handle
                 submenu_label = None    # This window cannot have children
                 menu_label = 'Menu label for this window'
-                ManagedWindow.ManagedWindow.__init__(self,
-                                                    uistate,
-                                                    track,
-                                                    window_id,
-                                                    submenu_label,
-                                                    menu_label)
+                ManagedWindow.__init__(self,
+                                       uistate,
+                                       track,
+                                       window_id,
+                                       submenu_label,
+                                       menu_label)
                 # Proceed with the class.
                 ...
                 
@@ -401,7 +401,7 @@ class ManagedWindow(object):
         :param msg:      if not None, use msg as title of window instead of text
         :param isWindow: {if isWindow than self is the window 
                             (so self inherits from gtk.Window and 
-                            from ManagedWindow.ManagedWindow)
+                            from ManagedWindow)
                          if not isWindow, than window is the Window to manage, 
                             and after this method self.window stores it.
                         }
diff --git a/src/gui/merge/mergecitation.py b/src/gui/merge/mergecitation.py
index 13bbc04df..38d2ab180 100644
--- a/src/gui/merge/mergecitation.py
+++ b/src/gui/merge/mergecitation.py
@@ -33,7 +33,7 @@ Provide merge capabilities for citations.
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import gen.datehandler
 from Utils import confidence
 from gen.merge import MergeCitationQuery
@@ -53,12 +53,12 @@ _GLADE_FILE = 'mergecitation.glade'
 # MergeCitation
 #
 #-------------------------------------------------------------------------
-class MergeCitation(ManagedWindow.ManagedWindow):
+class MergeCitation(ManagedWindow):
     """
     Displays a dialog box that allows the citations to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.citation1 = database.get_citation_from_handle(handle1)
diff --git a/src/gui/merge/mergeevent.py b/src/gui/merge/mergeevent.py
index 18353bcec..679c77a3b 100644
--- a/src/gui/merge/mergeevent.py
+++ b/src/gui/merge/mergeevent.py
@@ -32,7 +32,7 @@ Provide merge capabilities for events.
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import gen.datehandler
 import Utils
 from gen.merge import MergeEventQuery
@@ -52,12 +52,12 @@ _GLADE_FILE = 'mergeevent.glade'
 # MergeEvent
 #
 #-------------------------------------------------------------------------
-class MergeEvent(ManagedWindow.ManagedWindow):
+class MergeEvent(ManagedWindow):
     """
     Displays a dialog box that allows the events to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.ev1 = database.get_event_from_handle(handle1)
diff --git a/src/gui/merge/mergefamily.py b/src/gui/merge/mergefamily.py
index 83f496449..32a38c892 100644
--- a/src/gui/merge/mergefamily.py
+++ b/src/gui/merge/mergefamily.py
@@ -35,7 +35,7 @@ import const
 import GrampsDisplay
 from Errors import MergeError
 from QuestionDialog import ErrorDialog
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.merge import MergePersonQuery, MergeFamilyQuery
 
 #-------------------------------------------------------------------------
@@ -53,13 +53,13 @@ _GLADE_FILE = 'mergefamily.glade'
 # MergeFamily
 #
 #-------------------------------------------------------------------------
-class MergeFamily(ManagedWindow.ManagedWindow):
+class MergeFamily(ManagedWindow):
     """
     Merges two families into a single family. Displays a dialog box that allows
     the families to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.database = dbstate.db
         self.fy1 = self.database.get_family_from_handle(handle1)
         self.fy2 = self.database.get_family_from_handle(handle2)
diff --git a/src/gui/merge/mergemedia.py b/src/gui/merge/mergemedia.py
index 86a30ce9b..685661a98 100644
--- a/src/gui/merge/mergemedia.py
+++ b/src/gui/merge/mergemedia.py
@@ -32,7 +32,7 @@ Provide merge capabilities for media objects.
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import gen.datehandler
 from gen.merge import MergeMediaQuery
 
@@ -51,12 +51,12 @@ _GLADE_FILE = 'mergemedia.glade'
 # MergeMedia
 #
 #-------------------------------------------------------------------------
-class MergeMedia(ManagedWindow.ManagedWindow):
+class MergeMedia(ManagedWindow):
     """
     Displays a dialog box that allows the media objects to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.mo1 = database.get_object_from_handle(handle1)
diff --git a/src/gui/merge/mergenote.py b/src/gui/merge/mergenote.py
index c5f77f0d1..af5b53cbb 100644
--- a/src/gui/merge/mergenote.py
+++ b/src/gui/merge/mergenote.py
@@ -32,7 +32,7 @@ Provide merge capabilities for notes.
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gui.widgets.styledtextbuffer import StyledTextBuffer
 from gen.merge import MergeNoteQuery
 
@@ -51,12 +51,12 @@ _GLADE_FILE = 'mergenote.glade'
 # MergeNote
 #
 #-------------------------------------------------------------------------
-class MergeNote(ManagedWindow.ManagedWindow):
+class MergeNote(ManagedWindow):
     """
     Displays a dialog box that allows two notes to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.no1 = database.get_note_from_handle(handle1)
diff --git a/src/gui/merge/mergeperson.py b/src/gui/merge/mergeperson.py
index 402aff608..3fecc2d8e 100644
--- a/src/gui/merge/mergeperson.py
+++ b/src/gui/merge/mergeperson.py
@@ -46,7 +46,7 @@ import GrampsDisplay
 import gen.datehandler
 from Errors import MergeError
 from QuestionDialog import ErrorDialog
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.merge import MergePersonQuery
 
 #-------------------------------------------------------------------------
@@ -72,13 +72,13 @@ def name_of(person):
 # MergePerson
 #
 #-------------------------------------------------------------------------
-class MergePerson(ManagedWindow.ManagedWindow):
+class MergePerson(ManagedWindow):
     """
     Displays a dialog box that allows the persons to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2, cb_update=None,
             expand_context_info=False):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.database = dbstate.db
         self.pr1 = self.database.get_person_from_handle(handle1)
         self.pr2 = self.database.get_person_from_handle(handle2)
diff --git a/src/gui/merge/mergeplace.py b/src/gui/merge/mergeplace.py
index 803e55a61..76258132c 100644
--- a/src/gui/merge/mergeplace.py
+++ b/src/gui/merge/mergeplace.py
@@ -40,7 +40,7 @@ import gtk
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.merge import MergePlaceQuery
 
 #-------------------------------------------------------------------------
@@ -58,12 +58,12 @@ _GLADE_FILE = 'mergeplace.glade'
 # MergePlace
 #
 #-------------------------------------------------------------------------
-class MergePlace(ManagedWindow.ManagedWindow):
+class MergePlace(ManagedWindow):
     """
     Displays a dialog box that allows the places to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.pl1 = database.get_place_from_handle(handle1)
diff --git a/src/gui/merge/mergerepository.py b/src/gui/merge/mergerepository.py
index 4c1ba2ee9..4c431ac1a 100644
--- a/src/gui/merge/mergerepository.py
+++ b/src/gui/merge/mergerepository.py
@@ -32,7 +32,7 @@ Provide merge capabilities for repositories.
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.merge import MergeRepositoryQuery
 
 #-------------------------------------------------------------------------
@@ -50,12 +50,12 @@ _GLADE_FILE = 'mergerepository.glade'
 # MergeRepository
 #
 #-------------------------------------------------------------------------
-class MergeRepository(ManagedWindow.ManagedWindow):
+class MergeRepository(ManagedWindow):
     """
     Displays a dialog box that allows two repositories to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.rp1 = database.get_repository_from_handle(handle1)
diff --git a/src/gui/merge/mergesource.py b/src/gui/merge/mergesource.py
index fb9bf905d..19ef2646b 100644
--- a/src/gui/merge/mergesource.py
+++ b/src/gui/merge/mergesource.py
@@ -34,7 +34,7 @@ Provide merge capabilities for sources.
 from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.merge import MergeSourceQuery
 
 #-------------------------------------------------------------------------
@@ -52,12 +52,12 @@ _GLADE_FILE = 'mergesource.glade'
 # MergeSource
 #
 #-------------------------------------------------------------------------
-class MergeSource(ManagedWindow.ManagedWindow):
+class MergeSource(ManagedWindow):
     """
     Displays a dialog box that allows the sources to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         database = dbstate.db
         self.src1 = database.get_source_from_handle(handle1)
diff --git a/src/gui/plug/_dialogs.py b/src/gui/plug/_dialogs.py
index f7864104a..b679e9c14 100644
--- a/src/gui/plug/_dialogs.py
+++ b/src/gui/plug/_dialogs.py
@@ -47,7 +47,7 @@ from gui.plug import tool
 from gen.plug import REPORT
 from gui.plug.report import report
 from gui.pluginmanager import GuiPluginManager
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 
 #-------------------------------------------------------------------------
 #
@@ -63,7 +63,7 @@ _UNSUPPORTED = _("Unsupported")
 # PluginDialog interface class
 #
 #-------------------------------------------------------------------------
-class PluginDialog(ManagedWindow.ManagedWindow):
+class PluginDialog(ManagedWindow):
     """
     Displays the dialog box that allows the user to select the
     plugin that is desired.
@@ -82,7 +82,7 @@ class PluginDialog(ManagedWindow.ManagedWindow):
         self.content = content
         self._pmgr = GuiPluginManager.get_instance()
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, 
+        ManagedWindow.__init__(self, uistate, track, 
                                              self.__class__)
 
         self.state = state
diff --git a/src/gui/plug/_guioptions.py b/src/gui/plug/_guioptions.py
index 7e7511ac5..8e60090df 100644
--- a/src/gui/plug/_guioptions.py
+++ b/src/gui/plug/_guioptions.py
@@ -54,7 +54,7 @@ import Utils
 from gui.utils import ProgressMeter
 from gui.pluginmanager import GuiPluginManager
 from gui import widgets
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import OptionDialog
 from gui.selectors import SelectorFactory
 from gen.display.name import displayer as _nd
@@ -66,13 +66,13 @@ import gen
 # Dialog window used to select a surname
 #
 #------------------------------------------------------------------------
-class LastNameDialog(ManagedWindow.ManagedWindow):
+class LastNameDialog(ManagedWindow):
     """
     A dialog that allows the selection of a surname from the database.
     """
     def __init__(self, database, uistate, track, surnames, skip_list=set()):
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
         flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT | \
                 gtk.DIALOG_NO_SEPARATOR
         buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, 
diff --git a/src/gui/plug/_windows.py b/src/gui/plug/_windows.py
index d2d0c22f7..762cfaa40 100644
--- a/src/gui/plug/_windows.py
+++ b/src/gui/plug/_windows.py
@@ -46,7 +46,7 @@ import gobject
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import Errors
 from gen.plug import PluginRegister, PTYPE_STR, load_addon_file
 from gen.ggettext import gettext as _
@@ -71,7 +71,7 @@ def display_message(message):
 # PluginStatus: overview of all plugins
 #
 #-------------------------------------------------------------------------
-class PluginStatus(ManagedWindow.ManagedWindow):
+class PluginStatus(ManagedWindow):
     """Displays a dialog showing the status of loaded plugins"""
     HIDDEN = '<span color="red">%s</span>' % _('Hidden')
     AVAILABLE = '<span weight="bold" color="blue">%s</span>'\
@@ -81,7 +81,7 @@ class PluginStatus(ManagedWindow.ManagedWindow):
         self.dbstate = dbstate
         self.__uistate = uistate
         self.title = _("Plugin Manager")
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track,
+        ManagedWindow.__init__(self, uistate, track,
                                              self.__class__)
 
         self.__pmgr = GuiPluginManager.get_instance()
@@ -652,13 +652,13 @@ class PluginStatus(ManagedWindow.ManagedWindow):
 # Details for an individual plugin that failed
 #
 #-------------------------------------------------------------------------
-class PluginTrace(ManagedWindow.ManagedWindow):
+class PluginTrace(ManagedWindow):
     """Displays a dialog showing the status of loaded plugins"""
     
     def __init__(self, uistate, track, data, name):
         self.name = name
         title = "%s: %s" % (_("Plugin Error"), name)
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.set_window(gtk.Dialog("", uistate.window,
                                    gtk.DIALOG_DESTROY_WITH_PARENT,
@@ -697,7 +697,7 @@ class LinkTag(gtk.TextTag):
         except ValueError:
             pass # already in table
 
-class ToolManagedWindowBase(ManagedWindow.ManagedWindow):
+class ToolManagedWindowBase(ManagedWindow):
     """
     Copied from src/ReportBase/_BareReportDialog.py BareReportDialog
     """
@@ -705,7 +705,7 @@ class ToolManagedWindowBase(ManagedWindow.ManagedWindow):
     HELP_TOPIC = None
     def __init__(self, dbstate, uistate, option_class, name, callback=None):
         self.name = name
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
+        ManagedWindow.__init__(self, uistate, [], self)
 
         self.extra_menu = None
         self.widgets = []
diff --git a/src/gui/plug/quick/_textbufdoc.py b/src/gui/plug/quick/_textbufdoc.py
index 5ad6ea427..0c20f103b 100644
--- a/src/gui/plug/quick/_textbufdoc.py
+++ b/src/gui/plug/quick/_textbufdoc.py
@@ -38,7 +38,7 @@ import pango
 from gen.plug.docgen import (BaseDoc, TextDoc, FONT_SERIF, PARA_ALIGN_RIGHT,
                         FONT_SANS_SERIF, FONT_MONOSPACE, PARA_ALIGN_CENTER, 
                         PARA_ALIGN_LEFT)
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 
 try:
     import pangocairo
@@ -58,10 +58,10 @@ def pixels(cm):
 LEFT,RIGHT,CENTER = 'LEFT','RIGHT','CENTER'
 _WIDTH_IN_CHARS = 72
 
-class DisplayBuf(ManagedWindow.ManagedWindow):
+class DisplayBuf(ManagedWindow):
     def __init__(self, title, document):
         self.title = title
-        ManagedWindow.ManagedWindow.__init__(self, document.uistate, [], 
+        ManagedWindow.__init__(self, document.uistate, [], 
                                              document)
         self.set_window(gtk.Dialog("",document.uistate.window,
                                    gtk.DIALOG_DESTROY_WITH_PARENT,
diff --git a/src/gui/plug/report/_reportdialog.py b/src/gui/plug/report/_reportdialog.py
index bae4ad152..11711399b 100644
--- a/src/gui/plug/report/_reportdialog.py
+++ b/src/gui/plug/report/_reportdialog.py
@@ -59,7 +59,7 @@ from gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
                              CATEGORY_CODE, CATEGORY_WEB, CATEGORY_GRAPHVIZ,
                              standalone_categories)
 from gen.plug.docgen import StyleSheet, StyleSheetList
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from _stylecombobox import StyleComboBox
 from _styleeditor import StyleListDisplay
 from _fileentry import FileEntry
@@ -77,7 +77,7 @@ URL_REPORT_PAGE = URL_MANUAL_PAGE + "_-_Reports"
 # ReportDialog class
 #
 #-------------------------------------------------------------------------
-class ReportDialog(ManagedWindow.ManagedWindow):
+class ReportDialog(ManagedWindow):
     """
     The ReportDialog base class.  This is a base class for generating
     customized dialogs to solicit options for a report.  It cannot be
@@ -99,7 +99,7 @@ class ReportDialog(ManagedWindow.ManagedWindow):
         self.db = dbstate.db
         self.report_name = trans_name
         
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.init_options(option_class)
         self.init_interface()
@@ -125,7 +125,7 @@ class ReportDialog(ManagedWindow.ManagedWindow):
                 del fram[ind]
         self.frames.clear()
         self.frames = None
-        ManagedWindow.ManagedWindow.close(self, *obj)
+        ManagedWindow.close(self, *obj)
 
     def init_options(self, option_class):
         try:
diff --git a/src/gui/plug/report/_styleeditor.py b/src/gui/plug/report/_styleeditor.py
index 4d7939d9f..50c8f7a74 100644
--- a/src/gui/plug/report/_styleeditor.py
+++ b/src/gui/plug/report/_styleeditor.py
@@ -55,7 +55,7 @@ from gen.plug.docgen import (StyleSheet, FONT_SERIF, FONT_SANS_SERIF,
             PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT,  
             PARA_ALIGN_JUSTIFY) 
 import ListModel
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from glade import Glade
 
 #------------------------------------------------------------------------
diff --git a/src/gui/selectors/baseselector.py b/src/gui/selectors/baseselector.py
index daf58abea..3af1d1d18 100644
--- a/src/gui/selectors/baseselector.py
+++ b/src/gui/selectors/baseselector.py
@@ -34,7 +34,7 @@ import pango
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gui.filters import SearchBar
 from glade import Glade
 
@@ -43,7 +43,7 @@ from glade import Glade
 # SelectEvent
 #
 #-------------------------------------------------------------------------
-class BaseSelector(ManagedWindow.ManagedWindow):
+class BaseSelector(ManagedWindow):
     """Base class for the selectors, showing a dialog from which to select
         one of the primary objects
     """
@@ -66,7 +66,7 @@ class BaseSelector(ManagedWindow.ManagedWindow):
         if not hasattr(self, 'title'):
             self.title = self.get_window_title()
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.renderer = gtk.CellRendererText()
         self.track_ref_for_deletion("renderer")
@@ -369,5 +369,5 @@ class BaseSelector(ManagedWindow.ManagedWindow):
         self.search_bar.destroy()
 
     def close(self, *obj):
-        ManagedWindow.ManagedWindow.close(self)
+        ManagedWindow.close(self)
         self._cleanup_on_exit()
diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py
index 5319209c4..c6ed7fe05 100644
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -443,7 +443,7 @@ class ViewManager(CLIManager):
 
     def update_addons(self, addon_update_list):
         from glade import Glade
-        import ManagedWindow
+        from gui.managedwindow import ManagedWindow
         from ListModel import ListModel, NOSORT, TOGGLE
         glade = Glade("updateaddons.glade")
         self.update_dialog = glade.toplevel
diff --git a/src/gui/widgets/grampletpane.py b/src/gui/widgets/grampletpane.py
index fb5d9c45a..35ff50fb2 100644
--- a/src/gui/widgets/grampletpane.py
+++ b/src/gui/widgets/grampletpane.py
@@ -44,7 +44,7 @@ from gen.ggettext import gettext as _
 import Errors
 import const
 from gui.editors import EditPerson, EditFamily
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import ConfigParser
 import gui.utils
 from gui.plug.quick import run_quick_report_by_name
@@ -194,7 +194,7 @@ class LinkTag(gtk.TextTag):
         except ValueError: # tag is already in tag table
             pass
 
-class GrampletWindow(ManagedWindow.ManagedWindow):
+class GrampletWindow(ManagedWindow):
     """
     Class for showing a detached gramplet.
     """
@@ -209,7 +209,7 @@ class GrampletWindow(ManagedWindow.ManagedWindow):
         self.docked_state = gramplet.gstate
         # Now detach it
         self.gramplet.set_state("detached") 
-        ManagedWindow.ManagedWindow.__init__(self, gramplet.uistate, [],
+        ManagedWindow.__init__(self, gramplet.uistate, [],
                                              self.title)
         self.set_window(gtk.Dialog("", gramplet.uistate.window,
                                    gtk.DIALOG_DESTROY_WITH_PARENT,
@@ -300,7 +300,7 @@ class GrampletWindow(ManagedWindow.ManagedWindow):
         self.gramplet.gvclose.show()
         self.gramplet.gvstate.show()
         self.gramplet.gvproperties.show()
-        ManagedWindow.ManagedWindow.close(self, *args)
+        ManagedWindow.close(self, *args)
 
 #------------------------------------------------------------------------
 
diff --git a/src/gui/widgets/tageditor.py b/src/gui/widgets/tageditor.py
index 22c280cbc..c32f05275 100644
--- a/src/gui/widgets/tageditor.py
+++ b/src/gui/widgets/tageditor.py
@@ -34,7 +34,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 from gen.ggettext import sgettext as _
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import const
 import GrampsDisplay
 from ListModel import ListModel, TOGGLE
@@ -53,7 +53,7 @@ WIKI_HELP_SEC = _('manual|Tags')
 # TagEditor
 #
 #-------------------------------------------------------------------------
-class TagEditor(ManagedWindow.ManagedWindow):
+class TagEditor(ManagedWindow):
     """
     Dialog to allow the user to edit a list of tags.
     """
@@ -62,7 +62,7 @@ class TagEditor(ManagedWindow.ManagedWindow):
         """
         Initiate and display the dialog.
         """
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.namemodel = None
         top = self._create_dialog()
diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py
index 64b57c64a..51298b1b4 100644
--- a/src/plugins/BookReport.py
+++ b/src/plugins/BookReport.py
@@ -75,7 +75,7 @@ from gui.pluginmanager import GuiPluginManager
 from gen.plug.docgen import StyleSheet, StyleSheetList, PaperStyle
 from QuestionDialog import WarningDialog, ErrorDialog
 from gen.plug.menu import PersonOption, FilterOption, FamilyOption
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from glade import Glade
 import gui.utils
 import gui.user
@@ -712,7 +712,7 @@ class BookOptions(ReportOptions):
 # Book creation dialog 
 #
 #-------------------------------------------------------------------------
-class BookReportSelector(ManagedWindow.ManagedWindow):
+class BookReportSelector(ManagedWindow):
     """
     Interface into a dialog setting up the book. 
 
@@ -727,7 +727,7 @@ class BookReportSelector(ManagedWindow.ManagedWindow):
         self.title = _('Book Report')
         self.file = "books.xml"
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
 
         self.xml = Glade(toplevel="top")
         window = self.xml.toplevel
diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py
index 44c37ecac..0a9bdd440 100644
--- a/src/plugins/lib/maps/geography.py
+++ b/src/plugins/lib/maps/geography.py
@@ -54,7 +54,7 @@ import Errors
 import Bookmarks
 import const
 import constfunc
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from config import config
 from gui.editors import EditPlace, EditEvent, EditFamily, EditPerson
 from gui.selectors.selectplace import SelectPlace
diff --git a/src/plugins/lib/maps/placeselection.py b/src/plugins/lib/maps/placeselection.py
index cd635ee0e..da562806e 100644
--- a/src/plugins/lib/maps/placeselection.py
+++ b/src/plugins/lib/maps/placeselection.py
@@ -53,7 +53,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import Errors
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from osmGps import OsmGps
 
 #-------------------------------------------------------------------------
@@ -86,7 +86,7 @@ def match(self, lat, lon, radius):
 # PlaceSelection
 #
 #-------------------------------------------------------------------------
-class PlaceSelection(ManagedWindow.ManagedWindow, OsmGps):
+class PlaceSelection(ManagedWindow, OsmGps):
     """
     We show a selection box for possible places in a region of the map.
     We can select the diameter of the region which is a circle.
@@ -99,7 +99,7 @@ class PlaceSelection(ManagedWindow.ManagedWindow, OsmGps):
         Place Selection initialization
         """
         try:
-            ManagedWindow.ManagedWindow.__init__(self, uistate, [],
+            ManagedWindow.__init__(self, uistate, [],
                                                  PlaceSelection)
         except Errors.WindowActiveError:
             return
@@ -176,7 +176,7 @@ class PlaceSelection(ManagedWindow.ManagedWindow, OsmGps):
         Close the selection place editor
         """
         self.hide_the_region()
-        ManagedWindow.ManagedWindow.close(self, *obj)
+        ManagedWindow.close(self, *obj)
 
     def slider_change(self, obj, lat, lon):
         """
diff --git a/src/plugins/tool/ChangeNames.py b/src/plugins/tool/ChangeNames.py
index 083aaa3a4..d319f80bd 100644
--- a/src/plugins/tool/ChangeNames.py
+++ b/src/plugins/tool/ChangeNames.py
@@ -41,7 +41,7 @@ from gen.db import find_surname_name, DbTxn
 import const
 from gui.utils import ProgressMeter
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 
 from QuestionDialog import OkDialog
 from gui.plug import tool
@@ -69,13 +69,13 @@ WIKI_HELP_SEC = _('manual|Fix_Capitalization_of_Family_Names...')
 # ChangeNames
 #
 #-------------------------------------------------------------------------
-class ChangeNames(tool.BatchTool, ManagedWindow.ManagedWindow):
+class ChangeNames(tool.BatchTool, ManagedWindow):
 
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.label = _('Capitalization changes')
         self.cb = callback
         
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
+        ManagedWindow.__init__(self,uistate,[],self.__class__)
         self.set_window(gtk.Window(),gtk.Label(),'')
 
         tool.BatchTool.__init__(self, dbstate, options_class, name)
diff --git a/src/plugins/tool/ChangeTypes.py b/src/plugins/tool/ChangeTypes.py
index 704831ad5..65308242c 100644
--- a/src/plugins/tool/ChangeTypes.py
+++ b/src/plugins/tool/ChangeTypes.py
@@ -39,7 +39,7 @@ from gen.ggettext import ngettext
 #------------------------------------------------------------------------
 from gui.utils import ProgressMeter
 import locale
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import AutoComp
 from gen.lib import EventType
 from gen.db import DbTxn
@@ -52,7 +52,7 @@ from glade import Glade
 # ChangeTypes class
 #
 #-------------------------------------------------------------------------
-class ChangeTypes(tool.BatchTool, ManagedWindow.ManagedWindow):
+class ChangeTypes(tool.BatchTool, ManagedWindow):
 
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
 
@@ -62,7 +62,7 @@ class ChangeTypes(tool.BatchTool, ManagedWindow.ManagedWindow):
 
         if uistate:
             self.title = _('Change Event Types')
-            ManagedWindow.ManagedWindow.__init__(self,uistate,[],
+            ManagedWindow.__init__(self,uistate,[],
                                                  self.__class__)
             self.init_gui()
         else:
diff --git a/src/plugins/tool/Check.py b/src/plugins/tool/Check.py
index 84ae79686..5feab4cc2 100644
--- a/src/plugins/tool/Check.py
+++ b/src/plugins/tool/Check.py
@@ -67,7 +67,7 @@ from gen.db import DbTxn
 import config
 import Utils
 from gui.utils import ProgressMeter
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 
 from gui.plug import tool
 from QuestionDialog import OkDialog, MissingMediaDialog
@@ -2129,7 +2129,7 @@ class CheckIntegrity(object):
 # Display the results
 #
 #-------------------------------------------------------------------------
-class Report(ManagedWindow.ManagedWindow):
+class Report(ManagedWindow):
     
     def __init__(self, uistate, text, cl=0):
         if cl:
@@ -2137,7 +2137,7 @@ class Report(ManagedWindow.ManagedWindow):
             print (text.encode(sys.getfilesystemencoding()))
             return
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
+        ManagedWindow.__init__(self, uistate, [], self)
         
         topDialog = Glade()
         topDialog.get_object("close").connect('clicked', self.close)
diff --git a/src/plugins/tool/Desbrowser.py b/src/plugins/tool/Desbrowser.py
index 0a116a164..1a61d3dee 100644
--- a/src/plugins/tool/Desbrowser.py
+++ b/src/plugins/tool/Desbrowser.py
@@ -40,7 +40,7 @@ import const
 from gen.display.name import displayer as name_displayer
 from gui.plug import tool
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.ggettext import sgettext as _
 from glade import Glade
 from gui.editors import EditPerson
@@ -53,7 +53,7 @@ from gui.editors import EditPerson
 WIKI_HELP_PAGE = '%s_-_Tools' % const.URL_MANUAL_PAGE
 WIKI_HELP_SEC = _('manual|Interactive_Descendant_Browser...')
 
-class DesBrowse(tool.ActivePersonTool, ManagedWindow.ManagedWindow):
+class DesBrowse(tool.ActivePersonTool, ManagedWindow):
 
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
 
@@ -70,7 +70,7 @@ class DesBrowse(tool.ActivePersonTool, ManagedWindow.ManagedWindow):
                                 name_displayer.display(self.active)
                                 )
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
+        ManagedWindow.__init__(self, uistate, [], self)
 
         self.glade = Glade()
         self.glade.connect_signals({
diff --git a/src/plugins/tool/DumpGenderStats.py b/src/plugins/tool/DumpGenderStats.py
index 20c3af05e..1482ea743 100644
--- a/src/plugins/tool/DumpGenderStats.py
+++ b/src/plugins/tool/DumpGenderStats.py
@@ -29,7 +29,7 @@
 from gen.ggettext import gettext as _
 import gtk
 import ListModel
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 
 from gui.plug import tool
 
@@ -40,13 +40,13 @@ _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]
 #
 #
 #-------------------------------------------------------------------------
-class DumpGenderStats(tool.Tool, ManagedWindow.ManagedWindow):
+class DumpGenderStats(tool.Tool, ManagedWindow):
     
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.label = _("Gender Statistics tool")
         tool.Tool.__init__(self, dbstate, options_class, name)
         if uistate:
-            ManagedWindow.ManagedWindow.__init__(self,uistate,[],
+            ManagedWindow.__init__(self,uistate,[],
                                                  self.__class__)
 
         stats_list = []
diff --git a/src/plugins/tool/Eval.py b/src/plugins/tool/Eval.py
index 49eb01878..8401b56db 100644
--- a/src/plugins/tool/Eval.py
+++ b/src/plugins/tool/Eval.py
@@ -41,7 +41,7 @@ import traceback
 #
 #------------------------------------------------------------------------
 from gui.plug import tool
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from glade import Glade
 
 #-------------------------------------------------------------------------
@@ -49,12 +49,12 @@ from glade import Glade
 # Actual tool
 #
 #-------------------------------------------------------------------------
-class Eval(tool.Tool,ManagedWindow.ManagedWindow):
+class Eval(tool.Tool,ManagedWindow):
     def __init__(self,dbstate, uistate, options_class, name, callback=None):
         self.title =  _("Python evaluation window")
 
         tool.Tool.__init__(self,dbstate, options_class, name)
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
+        ManagedWindow.__init__(self,uistate,[],self.__class__)
 
         self.glade = Glade()
 
diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py
index 6b2a05f8d..a5c03d1ba 100644
--- a/src/plugins/tool/EventCmp.py
+++ b/src/plugins/tool/EventCmp.py
@@ -57,7 +57,7 @@ from QuestionDialog import WarningDialog
 from gui.plug import tool
 from gen.plug.report import utils as ReportUtils
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.ggettext import sgettext as _
 from glade import Glade
 from gui.filtereditor import FilterEditor
@@ -115,13 +115,13 @@ class TableReport(object):
 #
 #
 #------------------------------------------------------------------------
-class EventComparison(tool.Tool,ManagedWindow.ManagedWindow):
+class EventComparison(tool.Tool,ManagedWindow):
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.dbstate = dbstate
         self.uistate = uistate
 
         tool.Tool.__init__(self,dbstate, options_class, name)
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self)
+        ManagedWindow.__init__(self, uistate, [], self)
         self.qual = 0
 
         self.filterDialog = Glade(toplevel="filters")
@@ -216,12 +216,12 @@ def fix(line):
 #
 #
 #-------------------------------------------------------------------------
-class DisplayChart(ManagedWindow.ManagedWindow):
+class DisplayChart(ManagedWindow):
     def __init__(self,dbstate,uistate,people_list,track):
         self.dbstate = dbstate
         self.uistate = uistate
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate, track, self)
+        ManagedWindow.__init__(self, uistate, track, self)
 
         self.db = dbstate.db
         self.my_list = people_list
diff --git a/src/plugins/tool/EventNames.py b/src/plugins/tool/EventNames.py
index 9727c955a..26e3d47cc 100644
--- a/src/plugins/tool/EventNames.py
+++ b/src/plugins/tool/EventNames.py
@@ -43,7 +43,7 @@ from gen.ggettext import ngettext
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import gen.lib
 from gen.db import DbTxn
 import Utils
@@ -57,7 +57,7 @@ from QuestionDialog import OkDialog
 # EventNames
 #
 #-------------------------------------------------------------------------
-class EventNames(tool.BatchTool, ManagedWindow.ManagedWindow):
+class EventNames(tool.BatchTool, ManagedWindow):
     """
     Look for events that do not have a description, and build the description 
     from the item that contains it. 
diff --git a/src/plugins/tool/ExtractCity.py b/src/plugins/tool/ExtractCity.py
index da32d3aec..88ac6dfc2 100644
--- a/src/plugins/tool/ExtractCity.py
+++ b/src/plugins/tool/ExtractCity.py
@@ -47,7 +47,7 @@ import gobject
 #
 #-------------------------------------------------------------------------
 from gen.db import DbTxn
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import GrampsDisplay
 
 from gui.plug import tool
@@ -394,7 +394,7 @@ COLS = [
 # ExtractCity
 #
 #-------------------------------------------------------------------------
-class ExtractCity(tool.BatchTool, ManagedWindow.ManagedWindow):
+class ExtractCity(tool.BatchTool, ManagedWindow):
     """
     Extracts city, state, and zip code information from an place description
     if the title is empty and the description falls into the category of:
@@ -414,7 +414,7 @@ class ExtractCity(tool.BatchTool, ManagedWindow.ManagedWindow):
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.label = _('Extract Place data')
         
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.set_window(gtk.Window(), gtk.Label(), '')
 
         tool.BatchTool.__init__(self, dbstate, options_class, name)
diff --git a/src/plugins/tool/FindDupes.py b/src/plugins/tool/FindDupes.py
index d1c311d76..1bd928810 100644
--- a/src/plugins/tool/FindDupes.py
+++ b/src/plugins/tool/FindDupes.py
@@ -47,7 +47,7 @@ import ListModel
 import Errors
 from gui.merge import MergePerson
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import RunDatabaseRepair
 from gen.ggettext import sgettext as _
 from glade import Glade
@@ -85,12 +85,12 @@ def is_initial(name):
 # The Actual tool.
 #
 #-------------------------------------------------------------------------
-class Merge(tool.Tool,ManagedWindow.ManagedWindow):
+class Merge(tool.Tool,ManagedWindow):
     
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         
         tool.Tool.__init__(self, dbstate, options_class, name)
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [],
+        ManagedWindow.__init__(self, uistate, [],
                                              self.__class__)
         self.dbstate = dbstate
         self.uistate = uistate
@@ -525,10 +525,10 @@ class Merge(tool.Tool,ManagedWindow.ManagedWindow):
         return min(value,1) if value else -1
         
 
-class ShowMatches(ManagedWindow.ManagedWindow):
+class ShowMatches(ManagedWindow):
 
     def __init__(self, dbstate, uistate, track, the_list, the_map, callback):
-        ManagedWindow.ManagedWindow.__init__(self,uistate,track,self.__class__)
+        ManagedWindow.__init__(self,uistate,track,self.__class__)
 
         self.dellist = {}
         self.list = the_list
diff --git a/src/plugins/tool/Leak.py b/src/plugins/tool/Leak.py
index 1c35966f4..e882286d5 100644
--- a/src/plugins/tool/Leak.py
+++ b/src/plugins/tool/Leak.py
@@ -53,7 +53,7 @@ import gc
 #
 #------------------------------------------------------------------------
 from gui.plug import tool
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from QuestionDialog import InfoDialog
 from glade import Glade
 import gui.utils
@@ -63,12 +63,12 @@ import gui.utils
 # Actual tool
 #
 #-------------------------------------------------------------------------
-class Leak(tool.Tool, ManagedWindow.ManagedWindow):
+class Leak(tool.Tool, ManagedWindow):
     def __init__(self,dbstate, uistate, options_class, name, callback=None):
         self.title = _('Uncollected Objects Tool')
 
         tool.Tool.__init__(self,dbstate, options_class, name)
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
+        ManagedWindow.__init__(self,uistate,[],self.__class__)
 
         self.glade = Glade()
 
diff --git a/src/plugins/tool/MergeCitations.py b/src/plugins/tool/MergeCitations.py
index f166869c9..8a8964765 100644
--- a/src/plugins/tool/MergeCitations.py
+++ b/src/plugins/tool/MergeCitations.py
@@ -52,7 +52,7 @@ from gui.plug import tool
 from QuestionDialog import OkDialog
 import GrampsDisplay
 import gen.datehandler
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.ggettext import sgettext as _
 from gen.ggettext import ngettext
 from glade import Glade
@@ -86,11 +86,11 @@ WIKI_HELP_SEC = _('manual|Merge citations...')
 # The Actual tool.
 #
 #-------------------------------------------------------------------------
-class MergeCitations(tool.BatchTool,ManagedWindow.ManagedWindow):
+class MergeCitations(tool.BatchTool,ManagedWindow):
     
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         self.set_window(gtk.Window(), gtk.Label(), '')
 
diff --git a/src/plugins/tool/NotRelated.py b/src/plugins/tool/NotRelated.py
index 79e5e6d2f..d904af081 100644
--- a/src/plugins/tool/NotRelated.py
+++ b/src/plugins/tool/NotRelated.py
@@ -50,7 +50,7 @@ from gen.ggettext import ngettext
 from gui.plug import tool
 from gen.plug.report import utils as ReportUtils
 from gui.editors import EditPerson, EditFamily
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gui.utils import ProgressMeter
 import GrampsDisplay
 from gen.ggettext import sgettext as _
@@ -71,7 +71,7 @@ WIKI_HELP_SEC = _('manual|Not_Related...')
 # NotRelated class
 #
 #------------------------------------------------------------------------
-class NotRelated(tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
+class NotRelated(tool.ActivePersonTool, ManagedWindow) :
 
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         tool.ActivePersonTool.__init__(self, dbstate, uistate, options_class,
@@ -84,7 +84,7 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
         person = dbstate.db.get_person_from_handle(person_handle)
         self.name = person.get_primary_name().get_regular_name()
         self.title = _('Not related to "%s"') % self.name
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.dbstate = dbstate
         self.uistate = uistate
         self.db = dbstate.db
diff --git a/src/plugins/tool/OwnerEditor.py b/src/plugins/tool/OwnerEditor.py
index 6cf622d0a..1d77fbfaf 100644
--- a/src/plugins/tool/OwnerEditor.py
+++ b/src/plugins/tool/OwnerEditor.py
@@ -42,7 +42,7 @@ import config
 from Utils import get_researcher
 import GrampsDisplay
 from gui.widgets import MonitoredEntry
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gui.plug import tool
 from gen.ggettext import sgettext as _
 from glade import Glade
@@ -78,7 +78,7 @@ config_keys = (
 # OwnerEditor
 #
 #-------------------------------------------------------------------------
-class OwnerEditor(tool.Tool, ManagedWindow.ManagedWindow):
+class OwnerEditor(tool.Tool, ManagedWindow):
     """
     Allow editing database owner information.
 
@@ -86,7 +86,7 @@ class OwnerEditor(tool.Tool, ManagedWindow.ManagedWindow):
     current database. It also allows copying data from/to the preferences.
     """
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         tool.Tool.__init__(self, dbstate, options_class, name)
        
         self.display()
diff --git a/src/plugins/tool/PatchNames.py b/src/plugins/tool/PatchNames.py
index 0603e1784..8b0f5407e 100644
--- a/src/plugins/tool/PatchNames.py
+++ b/src/plugins/tool/PatchNames.py
@@ -48,7 +48,7 @@ import const
 from gui.utils import ProgressMeter
 from gui.plug import tool
 from QuestionDialog import OkDialog
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import GrampsDisplay
 import gen.lib
 from gen.db import DbTxn
@@ -96,7 +96,7 @@ _nick_re = re.compile(r"(.+) \s* [(\"] (.+) [)\"]", re.VERBOSE)
 #-------------------------------------------------------------------------
 
 
-class PatchNames(tool.BatchTool, ManagedWindow.ManagedWindow):
+class PatchNames(tool.BatchTool, ManagedWindow):
     titleid = 1
     nickid  = 2
     pref1id = 3
@@ -104,7 +104,7 @@ class PatchNames(tool.BatchTool, ManagedWindow.ManagedWindow):
     
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.label = _('Name and title extraction tool')
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.set_window(gtk.Window(), gtk.Label(), '')
 
         tool.BatchTool.__init__(self, dbstate, options_class, name)
diff --git a/src/plugins/tool/PopulateSources.py b/src/plugins/tool/PopulateSources.py
index 4aa28fb2f..130628569 100644
--- a/src/plugins/tool/PopulateSources.py
+++ b/src/plugins/tool/PopulateSources.py
@@ -45,18 +45,18 @@ import gtk
 from gui.utils import ProgressMeter
 from gui.plug import tool
 from QuestionDialog import OkDialog
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import gen.lib
 from gen.db import DbTxn
 
-class PopulateSources(tool.Tool, ManagedWindow.ManagedWindow):
+class PopulateSources(tool.Tool, ManagedWindow):
     """
     Gramplet that populates the database with sources and citations.
     """
     
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.label = 'Populate sources and citations tool'
-        ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
+        ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.set_window(gtk.Window(), gtk.Label(), '')
         tool.Tool.__init__(self, dbstate, options_class, name)
         
diff --git a/src/plugins/tool/RelCalc.py b/src/plugins/tool/RelCalc.py
index f62a564a4..1d7f4aa0b 100644
--- a/src/plugins/tool/RelCalc.py
+++ b/src/plugins/tool/RelCalc.py
@@ -45,7 +45,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 from gen.display.name import displayer as name_displayer
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gui.views.treemodels import PeopleBaseModel, PersonTreeModel
 from libpersonview import BasePersonView
 import Relationship
@@ -67,7 +67,7 @@ column_names = BasePersonView.COLUMN_NAMES
 #
 #
 #-------------------------------------------------------------------------
-class RelCalc(tool.Tool, ManagedWindow.ManagedWindow):
+class RelCalc(tool.Tool, ManagedWindow):
     
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         """
@@ -75,7 +75,7 @@ class RelCalc(tool.Tool, ManagedWindow.ManagedWindow):
         """
         
         tool.Tool.__init__(self, dbstate, options_class, name)
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
+        ManagedWindow.__init__(self,uistate,[],self.__class__)
 
         #set the columns to see
         for data in BasePersonView.CONFIGSETTINGS:
@@ -159,7 +159,7 @@ class RelCalc(tool.Tool, ManagedWindow.ManagedWindow):
         """
         self.relationship.disconnect_db_signals(self.dbstate)
         self.sel.disconnect(self.changedkey)
-        ManagedWindow.ManagedWindow.close(self, *obj)
+        ManagedWindow.close(self, *obj)
 
     def build_menu_names(self, obj):
         return (_("Relationship Calculator tool"),None)
diff --git a/src/plugins/tool/RemoveUnused.py b/src/plugins/tool/RemoveUnused.py
index f59be7bb7..650c74ea8 100644
--- a/src/plugins/tool/RemoveUnused.py
+++ b/src/plugins/tool/RemoveUnused.py
@@ -56,7 +56,7 @@ import gobject
 #-------------------------------------------------------------------------
 from gen.db import DbTxn
 import Errors
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 from gen.datehandler import displayer as _dd
 from gen.updatecallback import UpdateCallback
 from gui.plug import tool
@@ -67,7 +67,7 @@ from glade import Glade
 # runTool
 #
 #-------------------------------------------------------------------------
-class RemoveUnused(tool.Tool, ManagedWindow.ManagedWindow, UpdateCallback):
+class RemoveUnused(tool.Tool, ManagedWindow, UpdateCallback):
     MARK_COL       = 0
     OBJ_ID_COL     = 1
     OBJ_NAME_COL   = 2
@@ -82,7 +82,7 @@ class RemoveUnused(tool.Tool, ManagedWindow.ManagedWindow, UpdateCallback):
         if self.db.readonly:
             return
 
-        ManagedWindow.ManagedWindow.__init__(self, uistate,[], self.__class__)
+        ManagedWindow.__init__(self, uistate,[], self.__class__)
         UpdateCallback.__init__(self, self.uistate.pulse_progressbar)
 
         self.dbstate = dbstate
diff --git a/src/plugins/tool/SoundGen.py b/src/plugins/tool/SoundGen.py
index 1933bfbc2..edaf8bf20 100644
--- a/src/plugins/tool/SoundGen.py
+++ b/src/plugins/tool/SoundGen.py
@@ -32,7 +32,7 @@
 import const
 import soundex
 import GrampsDisplay
-import ManagedWindow
+from gui.managedwindow import ManagedWindow
 import AutoComp
 from gen.ggettext import sgettext as _
 from gui.plug import tool
@@ -52,12 +52,12 @@ WIKI_HELP_SEC = _('manual|Generate_SoundEx_codes')
 #
 #-------------------------------------------------------------------------
 
-class SoundGen(tool.Tool, ManagedWindow.ManagedWindow):
+class SoundGen(tool.Tool, ManagedWindow):
 
     def __init__(self, dbstate, uistate, options_class, name, callback=None):
         self.label = _('SoundEx code generator')
         tool.Tool.__init__(self, dbstate, options_class, name)
-        ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
+        ManagedWindow.__init__(self,uistate,[],self.__class__)
 
         self.glade = Glade()
         self.glade.connect_signals({
diff --git a/src/plugins/tool/Verify.py b/src/plugins/tool/Verify.py
index 3755b4440..7399e9f9e 100644
--- a/src/plugins/tool/Verify.py
+++ b/src/plugins/tool/Verify.py
@@ -59,7 +59,7 @@ import gen.lib
 from gui.editors import EditPerson, EditFamily
 import Utils
 import GrampsDisplay
-from ManagedWindow import ManagedWindow
+from ManagedWindow from gui.managedwindow import ManagedWindow
 from gen.updatecallback import UpdateCallback
 from gui.plug import tool
 from gen.ggettext import sgettext as _