diff --git a/pyqtgraph/canvas/Canvas.py b/pyqtgraph/canvas/Canvas.py
index 17a39c2b149c72d057f839968daed7ff7800866f..d07b3428d643568beb202b48914b2e5decd27e4e 100644
--- a/pyqtgraph/canvas/Canvas.py
+++ b/pyqtgraph/canvas/Canvas.py
@@ -3,29 +3,21 @@ if __name__ == '__main__':
     import sys, os
     md = os.path.dirname(os.path.abspath(__file__))
     sys.path = [os.path.dirname(md), os.path.join(md, '..', '..', '..')] + sys.path
-    #print md
 
-
-#from pyqtgraph.GraphicsView import GraphicsView
-#import pyqtgraph.graphicsItems as graphicsItems
-#from pyqtgraph.PlotWidget import PlotWidget
-from pyqtgraph.Qt import QtGui, QtCore, USE_PYSIDE
-from pyqtgraph.graphicsItems.ROI import ROI
-from pyqtgraph.graphicsItems.ViewBox import ViewBox
-from pyqtgraph.graphicsItems.GridItem import GridItem
+from ..Qt import QtGui, QtCore, USE_PYSIDE
+from ..graphicsItems.ROI import ROI
+from ..graphicsItems.ViewBox import ViewBox
+from ..graphicsItems.GridItem import GridItem
 
 if USE_PYSIDE:
     from .CanvasTemplate_pyside import *
 else:
     from .CanvasTemplate_pyqt import *
     
-#import DataManager
 import numpy as np
-from pyqtgraph import debug
-#import pyqtgraph as pg
+from .. import debug
 import weakref
 from .CanvasManager import CanvasManager
-#import items
 from .CanvasItem import CanvasItem, GroupCanvasItem
 
 class Canvas(QtGui.QWidget):
@@ -605,4 +597,4 @@ class SelectBox(ROI):
 
 
 
-    
\ No newline at end of file
+    
diff --git a/pyqtgraph/canvas/CanvasItem.py b/pyqtgraph/canvas/CanvasItem.py
index 81388cb64447e0decdf2bbd10e5b49db1cc4bdfe..a808765c7ae23cd2aaf49472a37632b554b51ad3 100644
--- a/pyqtgraph/canvas/CanvasItem.py
+++ b/pyqtgraph/canvas/CanvasItem.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
-from pyqtgraph.graphicsItems.ROI import ROI
-import pyqtgraph as pg
+from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
+from ..graphicsItems.ROI import ROI
+from .. import SRTTransform, ItemGroup
 if USE_PYSIDE:
     from . import TransformGuiTemplate_pyside as TransformGuiTemplate
 else:
     from . import TransformGuiTemplate_pyqt as TransformGuiTemplate
 
-from pyqtgraph import debug
+from .. import debug
 
 class SelectBox(ROI):
     def __init__(self, scalable=False, rotatable=True):
@@ -96,7 +96,7 @@ class CanvasItem(QtCore.QObject):
         if 'transform' in self.opts:
             self.baseTransform = self.opts['transform']
         else:
-            self.baseTransform = pg.SRTTransform()
+            self.baseTransform = SRTTransform()
             if 'pos' in self.opts and self.opts['pos'] is not None:
                 self.baseTransform.translate(self.opts['pos'])
             if 'angle' in self.opts and self.opts['angle'] is not None:
@@ -124,8 +124,8 @@ class CanvasItem(QtCore.QObject):
         self.itemScale = QtGui.QGraphicsScale()
         self._graphicsItem.setTransformations([self.itemRotation, self.itemScale])
         
-        self.tempTransform = pg.SRTTransform() ## holds the additional transform that happens during a move - gets added to the userTransform when move is done.
-        self.userTransform = pg.SRTTransform() ## stores the total transform of the object
+        self.tempTransform = SRTTransform() ## holds the additional transform that happens during a move - gets added to the userTransform when move is done.
+        self.userTransform = SRTTransform() ## stores the total transform of the object
         self.resetUserTransform() 
         
         ## now happens inside resetUserTransform -> selectBoxToItem
@@ -200,7 +200,7 @@ class CanvasItem(QtCore.QObject):
         #flip = self.transformGui.mirrorImageCheck.isChecked()
         #tr = self.userTransform.saveState()
         
-        inv = pg.SRTTransform()
+        inv = SRTTransform()
         inv.scale(-1, 1)
         self.userTransform = self.userTransform * inv
         self.updateTransform()
@@ -231,7 +231,7 @@ class CanvasItem(QtCore.QObject):
         if not self.isMovable():
             return
         self.rotate(180.)
-        # inv = pg.SRTTransform()
+        # inv = SRTTransform()
         # inv.scale(-1, -1)
         # self.userTransform = self.userTransform * inv #flip lr/ud
         # s=self.updateTransform()
@@ -316,7 +316,7 @@ class CanvasItem(QtCore.QObject):
 
 
     def resetTemporaryTransform(self):
-        self.tempTransform = pg.SRTTransform()  ## don't use Transform.reset()--this transform might be used elsewhere.
+        self.tempTransform = SRTTransform()  ## don't use Transform.reset()--this transform might be used elsewhere.
         self.updateTransform()
         
     def transform(self): 
@@ -368,7 +368,7 @@ class CanvasItem(QtCore.QObject):
         try:
             #self.userTranslate = pg.Point(tr['trans'])
             #self.userRotate = tr['rot']
-            self.userTransform = pg.SRTTransform(tr)
+            self.userTransform = SRTTransform(tr)
             self.updateTransform()
             
             self.selectBoxFromUser() ## move select box to match
@@ -377,7 +377,7 @@ class CanvasItem(QtCore.QObject):
         except:
             #self.userTranslate = pg.Point([0,0])
             #self.userRotate = 0
-            self.userTransform = pg.SRTTransform()
+            self.userTransform = SRTTransform()
             debug.printExc("Failed to load transform:")
         #print "set transform", self, self.userTranslate
         
@@ -504,6 +504,6 @@ class GroupCanvasItem(CanvasItem):
     def __init__(self, **opts):
         defOpts = {'movable': False, 'scalable': False}
         defOpts.update(opts)
-        item = pg.ItemGroup()
+        item = ItemGroup()
         CanvasItem.__init__(self, item, **defOpts)
     
diff --git a/pyqtgraph/canvas/CanvasManager.py b/pyqtgraph/canvas/CanvasManager.py
index e89ec00f9bb8262bb511d68d3ab74c303eb38171..28188039de11a2a324ae76e3ebd6eff225ed146b 100644
--- a/pyqtgraph/canvas/CanvasManager.py
+++ b/pyqtgraph/canvas/CanvasManager.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtCore, QtGui
+from ..Qt import QtCore, QtGui
 if not hasattr(QtCore, 'Signal'):
     QtCore.Signal = QtCore.pyqtSignal
 import weakref
diff --git a/pyqtgraph/canvas/CanvasTemplate_pyqt.py b/pyqtgraph/canvas/CanvasTemplate_pyqt.py
index 4d1d820877e3d5318bc662241c3af6c968a93e51..e465640dfbb589aa6173514d6079471ca5b8edc2 100644
--- a/pyqtgraph/canvas/CanvasTemplate_pyqt.py
+++ b/pyqtgraph/canvas/CanvasTemplate_pyqt.py
@@ -95,6 +95,6 @@ class Ui_Form(object):
         self.mirrorSelectionBtn.setText(QtGui.QApplication.translate("Form", "Mirror Selection", None, QtGui.QApplication.UnicodeUTF8))
         self.reflectSelectionBtn.setText(QtGui.QApplication.translate("Form", "MirrorXY", None, QtGui.QApplication.UnicodeUTF8))
 
-from pyqtgraph.widgets.GraphicsView import GraphicsView
+from ..widgets.GraphicsView import GraphicsView
 from CanvasManager import CanvasCombo
-from pyqtgraph.widgets.TreeWidget import TreeWidget
+from ..widgets.TreeWidget import TreeWidget
diff --git a/pyqtgraph/canvas/CanvasTemplate_pyside.py b/pyqtgraph/canvas/CanvasTemplate_pyside.py
index 12afdf25453704337991838cd3f5395b37a47098..8350ed33d3a972a278315d6e9c613de5ebc31bb3 100644
--- a/pyqtgraph/canvas/CanvasTemplate_pyside.py
+++ b/pyqtgraph/canvas/CanvasTemplate_pyside.py
@@ -90,6 +90,6 @@ class Ui_Form(object):
         self.mirrorSelectionBtn.setText(QtGui.QApplication.translate("Form", "Mirror Selection", None, QtGui.QApplication.UnicodeUTF8))
         self.reflectSelectionBtn.setText(QtGui.QApplication.translate("Form", "MirrorXY", None, QtGui.QApplication.UnicodeUTF8))
 
-from pyqtgraph.widgets.GraphicsView import GraphicsView
+from ..widgets.GraphicsView import GraphicsView
 from CanvasManager import CanvasCombo
-from pyqtgraph.widgets.TreeWidget import TreeWidget
+from ..widgets.TreeWidget import TreeWidget
diff --git a/pyqtgraph/flowchart/Flowchart.py b/pyqtgraph/flowchart/Flowchart.py
index f566e97c4e710db11e3ad78ec20a8b06bfd95356..8d1ea4ce8f9c808b4d819612a647f0a2dc411569 100644
--- a/pyqtgraph/flowchart/Flowchart.py
+++ b/pyqtgraph/flowchart/Flowchart.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtCore, QtGui, USE_PYSIDE
+from ..Qt import QtCore, QtGui, USE_PYSIDE
 from .Node import *
-from pyqtgraph.pgcollections import OrderedDict
-from pyqtgraph.widgets.TreeWidget import *
+from ..pgcollections import OrderedDict
+from ..widgets.TreeWidget import *
+from .. import FileDialog, DataTreeWidget
 
 ## pyside and pyqt use incompatible ui files.
 if USE_PYSIDE:
@@ -15,10 +16,9 @@ else:
 from .Terminal import Terminal
 from numpy import ndarray
 from .library import LIBRARY
-from pyqtgraph.debug import printExc
-import pyqtgraph.configfile as configfile
-import pyqtgraph.dockarea as dockarea
-import pyqtgraph as pg
+from ..debug import printExc
+from .. import configfile as configfile
+from .. import dockarea as dockarea
 from . import FlowchartGraphicsView
 
 def strDict(d):
@@ -537,7 +537,7 @@ class Flowchart(Node):
                 startDir = self.filePath
             if startDir is None:
                 startDir = '.'
-            self.fileDialog = pg.FileDialog(None, "Load Flowchart..", startDir, "Flowchart (*.fc)")
+            self.fileDialog = FileDialog(None, "Load Flowchart..", startDir, "Flowchart (*.fc)")
             #self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
             #self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
             self.fileDialog.show()
@@ -558,7 +558,7 @@ class Flowchart(Node):
                 startDir = self.filePath
             if startDir is None:
                 startDir = '.'
-            self.fileDialog = pg.FileDialog(None, "Save Flowchart..", startDir, "Flowchart (*.fc)")
+            self.fileDialog = FileDialog(None, "Save Flowchart..", startDir, "Flowchart (*.fc)")
             #self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
             self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
             #self.fileDialog.setDirectory(startDir)
@@ -821,7 +821,7 @@ class FlowchartWidget(dockarea.DockArea):
         self.selDescLabel = QtGui.QLabel()
         self.selNameLabel = QtGui.QLabel()
         self.selDescLabel.setWordWrap(True)
-        self.selectedTree = pg.DataTreeWidget()
+        self.selectedTree = DataTreeWidget()
         #self.selectedTree.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
         #self.selInfoLayout.addWidget(self.selNameLabel)
         self.selInfoLayout.addWidget(self.selDescLabel)
diff --git a/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py b/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py
index 0410cdf3d7abb0d063fd9ba65c80c05fb7f90c2b..41b7647d46e8532dd434910b7c474b681f340bdc 100644
--- a/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py
+++ b/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py
@@ -67,5 +67,5 @@ class Ui_Form(object):
         self.reloadBtn.setText(QtGui.QApplication.translate("Form", "Reload Libs", None, QtGui.QApplication.UnicodeUTF8))
         self.showChartBtn.setText(QtGui.QApplication.translate("Form", "Flowchart", None, QtGui.QApplication.UnicodeUTF8))
 
-from pyqtgraph.widgets.FeedbackButton import FeedbackButton
-from pyqtgraph.widgets.TreeWidget import TreeWidget
+from ..widgets.FeedbackButton import FeedbackButton
+from ..widgets.TreeWidget import TreeWidget
diff --git a/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py b/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py
index f579c9571671950d1152540cb5152a90b4530265..5695f8e6756482319378df994294a9006e061c60 100644
--- a/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py
+++ b/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py
@@ -62,5 +62,5 @@ class Ui_Form(object):
         self.reloadBtn.setText(QtGui.QApplication.translate("Form", "Reload Libs", None, QtGui.QApplication.UnicodeUTF8))
         self.showChartBtn.setText(QtGui.QApplication.translate("Form", "Flowchart", None, QtGui.QApplication.UnicodeUTF8))
 
-from pyqtgraph.widgets.FeedbackButton import FeedbackButton
-from pyqtgraph.widgets.TreeWidget import TreeWidget
+from ..widgets.FeedbackButton import FeedbackButton
+from ..widgets.TreeWidget import TreeWidget
diff --git a/pyqtgraph/flowchart/FlowchartGraphicsView.py b/pyqtgraph/flowchart/FlowchartGraphicsView.py
index 0ec4d5c83b70638efb51329f924e80b3fbe5fb6c..ab4b2914d155f34d41d8b77f69fca76f15897e0f 100644
--- a/pyqtgraph/flowchart/FlowchartGraphicsView.py
+++ b/pyqtgraph/flowchart/FlowchartGraphicsView.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtGui, QtCore
-from pyqtgraph.widgets.GraphicsView import GraphicsView
-from pyqtgraph.GraphicsScene import GraphicsScene
-from pyqtgraph.graphicsItems.ViewBox import ViewBox
+from ..Qt import QtGui, QtCore
+from ..widgets.GraphicsView import GraphicsView
+from ..GraphicsScene import GraphicsScene
+from ..graphicsItems.ViewBox import ViewBox
 
 #class FlowchartGraphicsView(QtGui.QGraphicsView):
 class FlowchartGraphicsView(GraphicsView):
diff --git a/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py b/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py
index c07dd7347cee37f78a1ddc456e786991b99abbae..dabcdc32898315e3f1593020b41dd333551f4659 100644
--- a/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py
+++ b/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py
@@ -55,5 +55,5 @@ class Ui_Form(object):
     def retranslateUi(self, Form):
         Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
 
-from pyqtgraph.widgets.DataTreeWidget import DataTreeWidget
-from pyqtgraph.flowchart.FlowchartGraphicsView import FlowchartGraphicsView
+from ..widgets.DataTreeWidget import DataTreeWidget
+from ..flowchart.FlowchartGraphicsView import FlowchartGraphicsView
diff --git a/pyqtgraph/flowchart/FlowchartTemplate_pyside.py b/pyqtgraph/flowchart/FlowchartTemplate_pyside.py
index c73f3c003ce4475cd533915e5a636eb43c63e9b3..1d47ed05b47d27081ae77bbd81309de00748386a 100644
--- a/pyqtgraph/flowchart/FlowchartTemplate_pyside.py
+++ b/pyqtgraph/flowchart/FlowchartTemplate_pyside.py
@@ -50,5 +50,5 @@ class Ui_Form(object):
     def retranslateUi(self, Form):
         Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
 
-from pyqtgraph.widgets.DataTreeWidget import DataTreeWidget
-from pyqtgraph.flowchart.FlowchartGraphicsView import FlowchartGraphicsView
+from ..widgets.DataTreeWidget import DataTreeWidget
+from ..flowchart.FlowchartGraphicsView import FlowchartGraphicsView
diff --git a/pyqtgraph/flowchart/Node.py b/pyqtgraph/flowchart/Node.py
index f1de40d665fe2c0b1b977ca41e48f5988a2b8664..b6ed1e0fb27b7fd9bb22992ccee83b9d2554b0fb 100644
--- a/pyqtgraph/flowchart/Node.py
+++ b/pyqtgraph/flowchart/Node.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtCore, QtGui
-from pyqtgraph.graphicsItems.GraphicsObject import GraphicsObject
-import pyqtgraph.functions as fn
+from ..Qt import QtCore, QtGui
+from ..graphicsItems.GraphicsObject import GraphicsObject
+from .. import functions as fn
 from .Terminal import *
-from pyqtgraph.pgcollections import OrderedDict
-from pyqtgraph.debug import *
+from ..pgcollections import OrderedDict
+from ..debug import *
 import numpy as np
 from .eq import *
 
diff --git a/pyqtgraph/flowchart/NodeLibrary.py b/pyqtgraph/flowchart/NodeLibrary.py
index 20d0085e1edb0d82af9bb1c0c1864a1c1af84f9b..a30ffb2a51362240e7a0d623d6172c07ea2e016d 100644
--- a/pyqtgraph/flowchart/NodeLibrary.py
+++ b/pyqtgraph/flowchart/NodeLibrary.py
@@ -1,4 +1,4 @@
-from pyqtgraph.pgcollections import OrderedDict
+from ..pgcollections import OrderedDict
 from .Node import Node
 
 def isNodeClass(cls):
diff --git a/pyqtgraph/flowchart/Terminal.py b/pyqtgraph/flowchart/Terminal.py
index fea60dee367e44e87e510b0e6d518ca16866ebe3..6a6db62e05b42be580ab8b7b97fc53f6907a5086 100644
--- a/pyqtgraph/flowchart/Terminal.py
+++ b/pyqtgraph/flowchart/Terminal.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtCore, QtGui
+from ..Qt import QtCore, QtGui
 import weakref
-from pyqtgraph.graphicsItems.GraphicsObject import GraphicsObject
-import pyqtgraph.functions as fn
-from pyqtgraph.Point import Point
+from ..graphicsItems.GraphicsObject import GraphicsObject
+from .. import functions as fn
+from ..Point import Point
 #from PySide import QtCore, QtGui
 from .eq import *
 
diff --git a/pyqtgraph/flowchart/eq.py b/pyqtgraph/flowchart/eq.py
index 031ebce86f1840f9724b809cdeb2de6aa1e8d2e4..89ebe09f75f596c96a8a4ef6b99982ea4f1252e3 100644
--- a/pyqtgraph/flowchart/eq.py
+++ b/pyqtgraph/flowchart/eq.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from numpy import ndarray, bool_
-from pyqtgraph.metaarray import MetaArray
+from ..metaarray import MetaArray
 
 def eq(a, b):
     """The great missing equivalence function: Guaranteed evaluation to a single bool value."""
diff --git a/pyqtgraph/flowchart/library/Data.py b/pyqtgraph/flowchart/library/Data.py
index cbef848ace4235ce97264bd607e1f83da7855e2c..52458bd990b5d5c74462dbeb1b8046526241bf19 100644
--- a/pyqtgraph/flowchart/library/Data.py
+++ b/pyqtgraph/flowchart/library/Data.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 from ..Node import Node
-from pyqtgraph.Qt import QtGui, QtCore
+from ...Qt import QtGui, QtCore
 import numpy as np
 from .common import *
-from pyqtgraph.SRTTransform import SRTTransform
-from pyqtgraph.Point import Point
-from pyqtgraph.widgets.TreeWidget import TreeWidget
-from pyqtgraph.graphicsItems.LinearRegionItem import LinearRegionItem
+from ...SRTTransform import SRTTransform
+from ...Point import Point
+from ...widgets.TreeWidget import TreeWidget
+from ...graphicsItems.LinearRegionItem import LinearRegionItem
 
 from . import functions
 
diff --git a/pyqtgraph/flowchart/library/Display.py b/pyqtgraph/flowchart/library/Display.py
index 9068c0ec8c6153fb70d39112a5b7de652084ec14..2c352fb2a03633c98f6fb9d28085616533c53253 100644
--- a/pyqtgraph/flowchart/library/Display.py
+++ b/pyqtgraph/flowchart/library/Display.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from ..Node import Node
 import weakref
-#from pyqtgraph import graphicsItems
-from pyqtgraph.Qt import QtCore, QtGui
-from pyqtgraph.graphicsItems.ScatterPlotItem import ScatterPlotItem
-from pyqtgraph.graphicsItems.PlotCurveItem import PlotCurveItem
-from pyqtgraph import PlotDataItem
+from ...Qt import QtCore, QtGui
+from ...graphicsItems.ScatterPlotItem import ScatterPlotItem
+from ...graphicsItems.PlotCurveItem import PlotCurveItem
+from ... import PlotDataItem
 
 from .common import *
 import numpy as np
@@ -272,4 +271,4 @@ class ScatterPlot(CtrlNode):
         #pos = file.
         
         
-        
\ No newline at end of file
+        
diff --git a/pyqtgraph/flowchart/library/Filters.py b/pyqtgraph/flowchart/library/Filters.py
index 090c261caed6ee4883afe46b116a3856d0efbc39..518c8c18a7fc68f7ab89b951272dfc9bd6b714db 100644
--- a/pyqtgraph/flowchart/library/Filters.py
+++ b/pyqtgraph/flowchart/library/Filters.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtCore, QtGui
+from ...Qt import QtCore, QtGui
 from ..Node import Node
 from scipy.signal import detrend
 from scipy.ndimage import median_filter, gaussian_filter
-#from pyqtgraph.SignalProxy import SignalProxy
+#from ...SignalProxy import SignalProxy
 from . import functions
 from .common import *
 import numpy as np
 
-import pyqtgraph.metaarray as metaarray
+from ... import metaarray as metaarray
 
 
 class Downsample(CtrlNode):
diff --git a/pyqtgraph/flowchart/library/__init__.py b/pyqtgraph/flowchart/library/__init__.py
index 32a17b5840a97ff8629e868fd3472bb6ee9aacfe..d8038aa4bace6ba5ebee3e046049b4aca6ecc12a 100644
--- a/pyqtgraph/flowchart/library/__init__.py
+++ b/pyqtgraph/flowchart/library/__init__.py
@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.pgcollections import OrderedDict
-#from pyqtgraph import importModules
+from ...pgcollections import OrderedDict
 import os, types
-from pyqtgraph.debug import printExc
-#from ..Node import Node
+from ...debug import printExc
 from ..NodeLibrary import NodeLibrary, isNodeClass
-import pyqtgraph.reload as reload
+from ... import reload as reload
 
 
 # Build default library
@@ -21,82 +19,10 @@ getNodeType = LIBRARY.getNodeType
 # Add all nodes to the default library
 from . import Data, Display, Filters, Operators
 for mod in [Data, Display, Filters, Operators]:
-    #mod = getattr(__import__('', fromlist=[modName], level=1), modName)
-    #mod = __import__(modName, level=1)
     nodes = [getattr(mod, name) for name in dir(mod) if isNodeClass(getattr(mod, name))]
     for node in nodes:
         LIBRARY.addNodeType(node, [(mod.__name__.split('.')[-1],)])
     
-#NODE_LIST = OrderedDict()  ## maps name:class for all registered Node subclasses
-#NODE_TREE = OrderedDict()  ## categorized tree of Node subclasses
-
-#def getNodeType(name):
-    #try:
-        #return NODE_LIST[name]
-    #except KeyError:
-        #raise Exception("No node type called '%s'" % name)
-
-#def getNodeTree():
-    #return NODE_TREE
-
-#def registerNodeType(cls, paths, override=False):
-    #"""
-    #Register a new node type. If the type's name is already in use,
-    #an exception will be raised (unless override=True).
-    
-    #Arguments:
-        #cls - a subclass of Node (must have typ.nodeName)
-        #paths - list of tuples specifying the location(s) this 
-                #type will appear in the library tree.
-        #override - if True, overwrite any class having the same name
-    #"""
-    #if not isNodeClass(cls):
-        #raise Exception("Object %s is not a Node subclass" % str(cls))
-    
-    #name = cls.nodeName
-    #if not override and name in NODE_LIST:
-        #raise Exception("Node type name '%s' is already registered." % name)
-    
-    #NODE_LIST[name] = cls
-    #for path in paths:
-        #root = NODE_TREE
-        #for n in path:
-            #if n not in root:
-                #root[n] = OrderedDict()
-            #root = root[n]
-        #root[name] = cls
-
-
-
-#def isNodeClass(cls):
-    #try:
-        #if not issubclass(cls, Node):
-            #return False
-    #except:
-        #return False
-    #return hasattr(cls, 'nodeName')
-
-#def loadLibrary(reloadLibs=False, libPath=None):
-    #"""Import all Node subclasses found within files in the library module."""
-
-    #global NODE_LIST, NODE_TREE
-    
-    #if reloadLibs:
-        #reload.reloadAll(libPath)
-        
-    #mods = importModules('', globals(), locals())
-        
-    #for name, mod in mods.items():
-        #nodes = []
-        #for n in dir(mod):
-            #o = getattr(mod, n)
-            #if isNodeClass(o):
-                #registerNodeType(o, [(name,)], override=reloadLibs)
-    
-#def reloadLibrary():
-    #loadLibrary(reloadLibs=True)
-    
-#loadLibrary()
 
 
 
diff --git a/pyqtgraph/flowchart/library/common.py b/pyqtgraph/flowchart/library/common.py
index 65f8c1fdc057f25b86cd20888361283bb770774f..548dc440618eaa7dcaacc5d4282487a9f06338b6 100644
--- a/pyqtgraph/flowchart/library/common.py
+++ b/pyqtgraph/flowchart/library/common.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-from pyqtgraph.Qt import QtCore, QtGui
-from pyqtgraph.widgets.SpinBox import SpinBox
-#from pyqtgraph.SignalProxy import SignalProxy
-from pyqtgraph.WidgetGroup import WidgetGroup
+from ...Qt import QtCore, QtGui
+from ...widgets.SpinBox import SpinBox
+#from ...SignalProxy import SignalProxy
+from ...WidgetGroup import WidgetGroup
 #from ColorMapper import ColorMapper
 from ..Node import Node
 import numpy as np
-from pyqtgraph.widgets.ColorButton import ColorButton
+from ...widgets.ColorButton import ColorButton
 try:
     import metaarray
     HAVE_METAARRAY = True
diff --git a/pyqtgraph/flowchart/library/functions.py b/pyqtgraph/flowchart/library/functions.py
index 0476e02f4bb48925b9fe7baab291ec7f55ebd079..9efb8f36a7b17a13251f1c9d4b905f1bfb31b116 100644
--- a/pyqtgraph/flowchart/library/functions.py
+++ b/pyqtgraph/flowchart/library/functions.py
@@ -1,6 +1,6 @@
 import scipy
 import numpy as np
-from pyqtgraph.metaarray import MetaArray
+from ...metaarray import MetaArray
 
 def downsample(data, n, axis=0, xvals='subsample'):
     """Downsample by averaging points together across axis.