7 files changed, 14 insertions, 14 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index b219ed2363..6a935740eb 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -28,8 +28,8 @@ import gtk
 import gobject
 
 
-from ..model import Constants, ParseXML
-from .. model.Constants import XTERM_EXECUTABLE
+from ..core import Constants, ParseXML
+from .. core.Constants import XTERM_EXECUTABLE
 
 from . import Dialogs, Messages, Preferences, Actions
 from .ParserErrorsDialog import ParserErrorsDialog
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 2439c32d22..9d718bc71d 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -30,10 +30,10 @@ from .Constants import (
     BORDER_PROXIMITY_SENSITIVITY
 )
 from . Element import Element
-from ..model.odict import odict
-from ..model.Param import num_to_str
-from ..model.utils.complexity import calculate_flowgraph_complexity
-from ..model.Block import Block as _Block
+from ..core.odict import odict
+from ..core.Param import num_to_str
+from ..core.utils.complexity import calculate_flowgraph_complexity
+from ..core.Block import Block as _Block
 
 BLOCK_MARKUP_TMPL="""\
 #set $foreground = $block.is_valid() and 'black' or 'red'
diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py
index d248543000..733c6b7218 100644
--- a/grc/gui/Connection.py
+++ b/grc/gui/Connection.py
@@ -24,8 +24,8 @@ import Utils
 from Constants import CONNECTOR_ARROW_BASE, CONNECTOR_ARROW_HEIGHT
 from Element import Element
 
-from ..model.Constants import GR_MESSAGE_DOMAIN
-from ..model.Connection import Connection as _Connection
+from ..core.Constants import GR_MESSAGE_DOMAIN
+from ..core.Connection import Connection as _Connection
 
 
 class Connection(Element, _Connection):
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py
index 0c66a7e5ad..28fc48fc13 100644
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@ -30,7 +30,7 @@ from . Element import Element
 from . Constants import SCROLL_PROXIMITY_SENSITIVITY, SCROLL_DISTANCE
 from . external_editor import ExternalEditor
 
-from ..model.FlowGraph import FlowGraph as _Flowgraph
+from ..core.FlowGraph import FlowGraph as _Flowgraph
 
 
 class FlowGraph(Element, _Flowgraph):
diff --git a/grc/gui/Param.py b/grc/gui/Param.py
index fed747b4f3..647e81746a 100644
--- a/grc/gui/Param.py
+++ b/grc/gui/Param.py
@@ -26,7 +26,7 @@ import gtk
 from . import Colors, Utils, Constants, Dialogs
 from .Element import Element
 
-from ..model.Param import Param as _Param
+from ..core.Param import Param as _Param
 
 
 class InputParam(gtk.HBox):
diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index af54e498d3..793065b025 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -22,8 +22,8 @@ import sys
 
 from .Element import Element
 
-from ..model.Platform import Platform as _Platform
-from ..model.Constants import PREFS_FILE, PREFS_FILE_OLD
+from ..core.Platform import Platform as _Platform
+from ..core.Constants import PREFS_FILE, PREFS_FILE_OLD
 
 from .Block import Block as _Block
 from .FlowGraph import FlowGraph as _FlowGraph
diff --git a/grc/gui/Port.py b/grc/gui/Port.py
index c281cbdeeb..6314b7ede8 100644
--- a/grc/gui/Port.py
+++ b/grc/gui/Port.py
@@ -27,9 +27,9 @@ from .Constants import (
     CONNECTOR_EXTENSION_INCREMENT, PORT_LABEL_PADDING, PORT_MIN_WIDTH, PORT_LABEL_HIDDEN_WIDTH, PORT_FONT
 )
 from .Element import Element
-from ..model.Constants import DEFAULT_DOMAIN, GR_MESSAGE_DOMAIN
+from ..core.Constants import DEFAULT_DOMAIN, GR_MESSAGE_DOMAIN
 
-from ..model.Port import Port as _Port
+from ..core.Port import Port as _Port
 
 PORT_MARKUP_TMPL="""\
 <span foreground="black" font_desc="$font">$encode($port.get_name())</span>"""