32 files changed, 15 insertions, 15 deletions
diff --git a/grc/model/Block.py b/grc/core/Block.py
index 8af3e98456..8af3e98456 100644
--- a/grc/model/Block.py
+++ b/grc/core/Block.py
diff --git a/grc/model/CMakeLists.txt b/grc/core/CMakeLists.txt
index 123bad2674..123bad2674 100644
--- a/grc/model/CMakeLists.txt
+++ b/grc/core/CMakeLists.txt
diff --git a/grc/model/Connection.py b/grc/core/Connection.py
index a7b428dfe6..a7b428dfe6 100644
--- a/grc/model/Connection.py
+++ b/grc/core/Connection.py
diff --git a/grc/model/Constants.py b/grc/core/Constants.py
index f1dae1d953..f1dae1d953 100644
--- a/grc/model/Constants.py
+++ b/grc/core/Constants.py
diff --git a/grc/model/Element.py b/grc/core/Element.py
index c999d6704f..c999d6704f 100644
--- a/grc/model/Element.py
+++ b/grc/core/Element.py
diff --git a/grc/model/FlowGraph.py b/grc/core/FlowGraph.py
index fd391c6b32..fd391c6b32 100644
--- a/grc/model/FlowGraph.py
+++ b/grc/core/FlowGraph.py
diff --git a/grc/model/Param.py b/grc/core/Param.py
index f064097256..f064097256 100644
--- a/grc/model/Param.py
+++ b/grc/core/Param.py
diff --git a/grc/model/ParseXML.py b/grc/core/ParseXML.py
index adf5cc97b7..adf5cc97b7 100644
--- a/grc/model/ParseXML.py
+++ b/grc/core/ParseXML.py
diff --git a/grc/model/Platform.py b/grc/core/Platform.py
index f04dd04e90..f04dd04e90 100644
--- a/grc/model/Platform.py
+++ b/grc/core/Platform.py
diff --git a/grc/model/Port.py b/grc/core/Port.py
index bfa48102a7..bfa48102a7 100644
--- a/grc/model/Port.py
+++ b/grc/core/Port.py
diff --git a/grc/model/__init__.py b/grc/core/__init__.py
index 8b13789179..8b13789179 100644
--- a/grc/model/__init__.py
+++ b/grc/core/__init__.py
diff --git a/grc/model/block.dtd b/grc/core/block.dtd
index 145f4d8610..145f4d8610 100644
--- a/grc/model/block.dtd
+++ b/grc/core/block.dtd
diff --git a/grc/model/block_tree.dtd b/grc/core/block_tree.dtd
index 9e23576477..9e23576477 100644
--- a/grc/model/block_tree.dtd
+++ b/grc/core/block_tree.dtd
diff --git a/grc/model/default_flow_graph.grc b/grc/core/default_flow_graph.grc
index 059509d34b..059509d34b 100644
--- a/grc/model/default_flow_graph.grc
+++ b/grc/core/default_flow_graph.grc
diff --git a/grc/model/domain.dtd b/grc/core/domain.dtd
index b5b0b8bf39..b5b0b8bf39 100644
--- a/grc/model/domain.dtd
+++ b/grc/core/domain.dtd
diff --git a/grc/model/epy_block_io.py b/grc/core/epy_block_io.py
index e089908a01..e089908a01 100644
--- a/grc/model/epy_block_io.py
+++ b/grc/core/epy_block_io.py
diff --git a/grc/model/expr_utils.py b/grc/core/expr_utils.py
index 66911757d6..66911757d6 100644
--- a/grc/model/expr_utils.py
+++ b/grc/core/expr_utils.py
diff --git a/grc/model/extract_docs.py b/grc/core/extract_docs.py
index a6e0bc971e..a6e0bc971e 100644
--- a/grc/model/extract_docs.py
+++ b/grc/core/extract_docs.py
diff --git a/grc/model/flow_graph.dtd b/grc/core/flow_graph.dtd
index bdfe1dc059..bdfe1dc059 100644
--- a/grc/model/flow_graph.dtd
+++ b/grc/core/flow_graph.dtd
diff --git a/grc/model/generator/Generator.py b/grc/core/generator/Generator.py
index 27cb24a18b..b1fb73b821 100644
--- a/grc/model/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -31,7 +31,7 @@ from Cheetah.Template import Template
 from .. import ParseXML, expr_utils
 from ..odict import odict
 
-from grc.model.Constants import (
+from ..Constants import (
     TOP_BLOCK_FILE_MODE, BLOCK_FLAG_NEED_QT_GUI,
     XTERM_EXECUTABLE, HIER_BLOCK_FILE_MODE, HIER_BLOCKS_LIB_DIR, BLOCK_DTD
 )
diff --git a/grc/model/generator/__init__.py b/grc/core/generator/__init__.py
index fb1e44120a..fb1e44120a 100644
--- a/grc/model/generator/__init__.py
+++ b/grc/core/generator/__init__.py
diff --git a/grc/model/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl
index bd8025b676..bd8025b676 100644
--- a/grc/model/generator/flow_graph.tmpl
+++ b/grc/core/generator/flow_graph.tmpl
diff --git a/grc/model/odict.py b/grc/core/odict.py
index 20970e947c..20970e947c 100644
--- a/grc/model/odict.py
+++ b/grc/core/odict.py
diff --git a/grc/model/utils/__init__.py b/grc/core/utils/__init__.py
index 805d6f4aec..805d6f4aec 100644
--- a/grc/model/utils/__init__.py
+++ b/grc/core/utils/__init__.py
diff --git a/grc/model/utils/complexity.py b/grc/core/utils/complexity.py
index baa8040db4..baa8040db4 100644
--- a/grc/model/utils/complexity.py
+++ b/grc/core/utils/complexity.py
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>"""