diff --git a/doc/non-bpmn/tutorial/start.py b/doc/non-bpmn/tutorial/start.py
index e52b66c63..4090384cc 100644
--- a/doc/non-bpmn/tutorial/start.py
+++ b/doc/non-bpmn/tutorial/start.py
@@ -1,6 +1,6 @@
 import json
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.serializer.json import JSONSerializer
 
 # Load from JSON
diff --git a/tests/SpiffWorkflow/PatternTest.py b/tests/SpiffWorkflow/PatternTest.py
index 8d11528fd..f0d013ce0 100644
--- a/tests/SpiffWorkflow/PatternTest.py
+++ b/tests/SpiffWorkflow/PatternTest.py
@@ -6,7 +6,7 @@ import unittest
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.task import Task
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 from tests.SpiffWorkflow.util import run_workflow
diff --git a/tests/SpiffWorkflow/PersistSmallWorkflowTest.py b/tests/SpiffWorkflow/PersistSmallWorkflowTest.py
index c580c87d7..b554be189 100644
--- a/tests/SpiffWorkflow/PersistSmallWorkflowTest.py
+++ b/tests/SpiffWorkflow/PersistSmallWorkflowTest.py
@@ -6,7 +6,9 @@ import os.path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import Join, MultiChoice, WorkflowSpec
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.MultiChoice import MultiChoice
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.operators import Attrib, Equal, PathAttrib
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.specs.Simple import Simple
diff --git a/tests/SpiffWorkflow/TaskTest.py b/tests/SpiffWorkflow/TaskTest.py
index af4f28e33..e44f68e6f 100644
--- a/tests/SpiffWorkflow/TaskTest.py
+++ b/tests/SpiffWorkflow/TaskTest.py
@@ -7,7 +7,8 @@ import os.path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
 from SpiffWorkflow.task import Task, TaskState, updateDotDict
-from SpiffWorkflow.specs import WorkflowSpec, Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
+from SpiffWorkflow.specs.Simple import Simple
 
 
 class MockWorkflow(object):
diff --git a/tests/SpiffWorkflow/WorkflowTest.py b/tests/SpiffWorkflow/WorkflowTest.py
index e47f069da..0d2b0b3d0 100644
--- a/tests/SpiffWorkflow/WorkflowTest.py
+++ b/tests/SpiffWorkflow/WorkflowTest.py
@@ -7,7 +7,9 @@ data_dir = os.path.join(os.path.dirname(__file__), 'data')
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import Cancel, Simple, WorkflowSpec
+from SpiffWorkflow.specs.Cancel import Cancel
+from SpiffWorkflow.specs.Simple import Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 
diff --git a/tests/SpiffWorkflow/bpmn/ApprovalsTest.py b/tests/SpiffWorkflow/bpmn/ApprovalsTest.py
index 19f493806..7576a23fe 100644
--- a/tests/SpiffWorkflow/bpmn/ApprovalsTest.py
+++ b/tests/SpiffWorkflow/bpmn/ApprovalsTest.py
@@ -2,7 +2,7 @@
 
 import unittest
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
-from SpiffWorkflow.bpmn.specs.events import MessageEventDefinition
+from SpiffWorkflow.bpmn.specs.events.event_definitions import MessageEventDefinition
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 
 __author__ = 'matth'
diff --git a/tests/SpiffWorkflow/bpmn/BpmnLoaderForTests.py b/tests/SpiffWorkflow/bpmn/BpmnLoaderForTests.py
index 7a407cc7f..54c18709f 100644
--- a/tests/SpiffWorkflow/bpmn/BpmnLoaderForTests.py
+++ b/tests/SpiffWorkflow/bpmn/BpmnLoaderForTests.py
@@ -10,7 +10,7 @@ from SpiffWorkflow.bpmn.serializer.bpmn_converters import BpmnTaskSpecConverter
 
 # Many of our tests relied on the Packager to set the calledElement attribute on
 # Call Activities.  I've moved that code to a customized parser.
-from SpiffWorkflow.signavio.parser import CallActivityParser
+from SpiffWorkflow.signavio.parser.tasks import CallActivityParser
 from SpiffWorkflow.bpmn.specs.SubWorkflowTask import CallActivity
 
 __author__ = 'matth'
diff --git a/tests/SpiffWorkflow/bpmn/BpmnWorkflowSerializerTest.py b/tests/SpiffWorkflow/bpmn/BpmnWorkflowSerializerTest.py
index d0d1a9479..ac2ae463c 100644
--- a/tests/SpiffWorkflow/bpmn/BpmnWorkflowSerializerTest.py
+++ b/tests/SpiffWorkflow/bpmn/BpmnWorkflowSerializerTest.py
@@ -6,7 +6,7 @@ from uuid import uuid4
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.bpmn.PythonScriptEngine import PythonScriptEngine
 from SpiffWorkflow.bpmn.parser.BpmnParser import BpmnParser
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 from SpiffWorkflow.bpmn.serializer.BpmnSerializer import BpmnSerializer
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
 from tests.SpiffWorkflow.bpmn.BpmnLoaderForTests import TestUserTaskConverter
diff --git a/tests/SpiffWorkflow/bpmn/BpmnWorkflowTestCase.py b/tests/SpiffWorkflow/bpmn/BpmnWorkflowTestCase.py
index 5a341188b..e2864919e 100644
--- a/tests/SpiffWorkflow/bpmn/BpmnWorkflowTestCase.py
+++ b/tests/SpiffWorkflow/bpmn/BpmnWorkflowTestCase.py
@@ -7,7 +7,7 @@ from SpiffWorkflow.bpmn.parser.BpmnParser import BpmnValidator
 
 from SpiffWorkflow.task import TaskState
 
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 from .BpmnLoaderForTests import TestUserTaskConverter, TestBpmnParser
 
 __author__ = 'matth'
diff --git a/tests/SpiffWorkflow/bpmn/ProcessDependencyTest.py b/tests/SpiffWorkflow/bpmn/ProcessDependencyTest.py
index b3a795196..86514a034 100644
--- a/tests/SpiffWorkflow/bpmn/ProcessDependencyTest.py
+++ b/tests/SpiffWorkflow/bpmn/ProcessDependencyTest.py
@@ -3,7 +3,7 @@ import os
 import unittest
 
 from SpiffWorkflow.camunda.parser.CamundaParser import CamundaParser
-from SpiffWorkflow.spiff.parser import SpiffBpmnParser
+from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 
diff --git a/tests/SpiffWorkflow/bpmn/events/MultipleEventsTest.py b/tests/SpiffWorkflow/bpmn/events/MultipleEventsTest.py
index b1e2a24d5..86c552358 100644
--- a/tests/SpiffWorkflow/bpmn/events/MultipleEventsTest.py
+++ b/tests/SpiffWorkflow/bpmn/events/MultipleEventsTest.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from SpiffWorkflow.bpmn.specs.events import CancelEventDefinition, SignalEventDefinition
+from SpiffWorkflow.bpmn.specs.events.event_definitions import CancelEventDefinition, SignalEventDefinition
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
diff --git a/tests/SpiffWorkflow/bpmn/events/TimerDurationBoundaryOnTaskTest.py b/tests/SpiffWorkflow/bpmn/events/TimerDurationBoundaryOnTaskTest.py
index e87de251e..9bd1f322b 100644
--- a/tests/SpiffWorkflow/bpmn/events/TimerDurationBoundaryOnTaskTest.py
+++ b/tests/SpiffWorkflow/bpmn/events/TimerDurationBoundaryOnTaskTest.py
@@ -5,7 +5,7 @@ import datetime
 import time
 from datetime import timedelta
 
-from SpiffWorkflow.bpmn.specs.events import EndEvent
+from SpiffWorkflow.bpmn.specs.events.EndEvent import EndEvent
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
 from SpiffWorkflow.bpmn.PythonScriptEngine import PythonScriptEngine
diff --git a/tests/SpiffWorkflow/camunda/BaseTestCase.py b/tests/SpiffWorkflow/camunda/BaseTestCase.py
index 6ea39d0ac..b41a8aab7 100644
--- a/tests/SpiffWorkflow/camunda/BaseTestCase.py
+++ b/tests/SpiffWorkflow/camunda/BaseTestCase.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 import os
 
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 from SpiffWorkflow.camunda.parser.CamundaParser import CamundaParser
-from SpiffWorkflow.camunda.serializer import UserTaskConverter, StartEventConverter, EndEventConverter, \
+from SpiffWorkflow.camunda.serializer.task_spec_converters import UserTaskConverter, StartEventConverter, EndEventConverter, \
     IntermediateCatchEventConverter, IntermediateThrowEventConverter, BoundaryEventConverter
 
-from SpiffWorkflow.dmn.serializer import BusinessRuleTaskConverter
+from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 
diff --git a/tests/SpiffWorkflow/camunda/specs/UserTaskSpecTest.py b/tests/SpiffWorkflow/camunda/specs/UserTaskSpecTest.py
index 2d3c16d7f..33f621912 100644
--- a/tests/SpiffWorkflow/camunda/specs/UserTaskSpecTest.py
+++ b/tests/SpiffWorkflow/camunda/specs/UserTaskSpecTest.py
@@ -3,7 +3,8 @@ import unittest
 
 from SpiffWorkflow.camunda.specs.UserTask import FormField, UserTask, Form, \
     EnumFormField
-from SpiffWorkflow.specs import WorkflowSpec, TaskSpec
+from SpiffWorkflow.specs.base import TaskSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 
 
 class UserTaskSpecTest(unittest.TestCase):
diff --git a/tests/SpiffWorkflow/data/spiff/workflow1.py b/tests/SpiffWorkflow/data/spiff/workflow1.py
index fba204bd6..bc963fea1 100644
--- a/tests/SpiffWorkflow/data/spiff/workflow1.py
+++ b/tests/SpiffWorkflow/data/spiff/workflow1.py
@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from SpiffWorkflow.specs import ExclusiveChoice, Join, MultiChoice, MultiInstance, Simple, WorkflowSpec
+from SpiffWorkflow.specs.ExclusiveChoice import ExclusiveChoice
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.MultiChoice import MultiChoice
+from SpiffWorkflow.specs.MultiInstance import MultiInstance
+from SpiffWorkflow.specs.Simple import Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.operators import Attrib, Equal, NotEqual
 
 
diff --git a/tests/SpiffWorkflow/serializer/baseTest.py b/tests/SpiffWorkflow/serializer/baseTest.py
index 9bb79b137..7ac41f3c7 100644
--- a/tests/SpiffWorkflow/serializer/baseTest.py
+++ b/tests/SpiffWorkflow/serializer/baseTest.py
@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(dirname, '..'))
 
 from PatternTest import run_workflow, PatternTest
 from SpiffWorkflow.serializer.base import Serializer
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.workflow import Workflow
 from SpiffWorkflow.serializer.exceptions import TaskNotSupportedError
 
diff --git a/tests/SpiffWorkflow/specs/CeleryTest.py b/tests/SpiffWorkflow/specs/CeleryTest.py
index 9190dd33f..ac8116881 100644
--- a/tests/SpiffWorkflow/specs/CeleryTest.py
+++ b/tests/SpiffWorkflow/specs/CeleryTest.py
@@ -6,7 +6,8 @@ import unittest
 import pickle
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 from .TaskSpecTest import TaskSpecTest
-from SpiffWorkflow.specs import Celery, WorkflowSpec
+from SpiffWorkflow.specs.Celery import Celery
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.operators import Attrib
 from SpiffWorkflow.serializer.dict import DictionarySerializer
 from base64 import b64encode
diff --git a/tests/SpiffWorkflow/specs/ExecuteTest.py b/tests/SpiffWorkflow/specs/ExecuteTest.py
index bd3b06fd5..fc16db931 100644
--- a/tests/SpiffWorkflow/specs/ExecuteTest.py
+++ b/tests/SpiffWorkflow/specs/ExecuteTest.py
@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 from tests.SpiffWorkflow.util import run_workflow
 from .TaskSpecTest import TaskSpecTest
 from SpiffWorkflow.task import TaskState
-from SpiffWorkflow.specs import Execute
+from SpiffWorkflow.specs.Execute import Execute
 
 
 class ExecuteTest(TaskSpecTest):
diff --git a/tests/SpiffWorkflow/specs/JoinTest.py b/tests/SpiffWorkflow/specs/JoinTest.py
index 3eeb92866..7224701f5 100644
--- a/tests/SpiffWorkflow/specs/JoinTest.py
+++ b/tests/SpiffWorkflow/specs/JoinTest.py
@@ -8,7 +8,7 @@ import unittest
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 from .TaskSpecTest import TaskSpecTest
-from SpiffWorkflow.specs import Join
+from SpiffWorkflow.specs.Join import Join
 
 
 class JoinTest(TaskSpecTest):
diff --git a/tests/SpiffWorkflow/specs/MergeTest.py b/tests/SpiffWorkflow/specs/MergeTest.py
index 68f028d90..6fc692a66 100644
--- a/tests/SpiffWorkflow/specs/MergeTest.py
+++ b/tests/SpiffWorkflow/specs/MergeTest.py
@@ -8,7 +8,9 @@ import unittest
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 from .JoinTest import JoinTest
-from SpiffWorkflow.specs import Merge, WorkflowSpec, Simple
+from SpiffWorkflow.specs.Merge import Merge
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
+from SpiffWorkflow.specs.Simple import Simple
 from SpiffWorkflow.workflow import Workflow
 
 
diff --git a/tests/SpiffWorkflow/specs/SubWorkflowTest.py b/tests/SpiffWorkflow/specs/SubWorkflowTest.py
index aed09fc27..5baacf99e 100644
--- a/tests/SpiffWorkflow/specs/SubWorkflowTest.py
+++ b/tests/SpiffWorkflow/specs/SubWorkflowTest.py
@@ -6,7 +6,7 @@ import os
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.specs.SubWorkflow import SubWorkflow
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 from SpiffWorkflow.task import TaskState
diff --git a/tests/SpiffWorkflow/specs/TaskSpecTest.py b/tests/SpiffWorkflow/specs/TaskSpecTest.py
index 2b213b4af..2509d6184 100644
--- a/tests/SpiffWorkflow/specs/TaskSpecTest.py
+++ b/tests/SpiffWorkflow/specs/TaskSpecTest.py
@@ -5,9 +5,11 @@ import unittest
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
-from SpiffWorkflow.specs import WorkflowSpec, Simple, Join
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.Simple import Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.exceptions import WorkflowException
-from SpiffWorkflow.specs import TaskSpec
+from SpiffWorkflow.specs.base import TaskSpec
 from SpiffWorkflow.serializer.dict import DictionarySerializer
 
 
diff --git a/tests/SpiffWorkflow/specs/TransformTest.py b/tests/SpiffWorkflow/specs/TransformTest.py
index ca2aaf1c3..228a038ec 100644
--- a/tests/SpiffWorkflow/specs/TransformTest.py
+++ b/tests/SpiffWorkflow/specs/TransformTest.py
@@ -9,7 +9,8 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 from tests.SpiffWorkflow.util import run_workflow
 from .TaskSpecTest import TaskSpecTest
-from SpiffWorkflow.specs import Transform, Simple
+from SpiffWorkflow.specs.Transform import Transform
+from SpiffWorkflow.specs.Simple import Simple
 
 
 class TransformTest(TaskSpecTest):
diff --git a/tests/SpiffWorkflow/specs/WorkflowSpecTest.py b/tests/SpiffWorkflow/specs/WorkflowSpecTest.py
index 8b0289b8d..9b4c0d322 100644
--- a/tests/SpiffWorkflow/specs/WorkflowSpecTest.py
+++ b/tests/SpiffWorkflow/specs/WorkflowSpecTest.py
@@ -15,7 +15,8 @@ try:
 except ImportError as e:
     from tests.SpiffWorkflow.util import track_workflow
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import Join, WorkflowSpec
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 
 serializer = XmlSerializer()
diff --git a/tests/SpiffWorkflow/spiff/BaseTestCase.py b/tests/SpiffWorkflow/spiff/BaseTestCase.py
index 9e882fcb9..b085d1f76 100644
--- a/tests/SpiffWorkflow/spiff/BaseTestCase.py
+++ b/tests/SpiffWorkflow/spiff/BaseTestCase.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import os
 
-from SpiffWorkflow.spiff.parser import SpiffBpmnParser, VALIDATOR
-from SpiffWorkflow.spiff.serializer import NoneTaskConverter, \
+from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser, VALIDATOR
+from SpiffWorkflow.spiff.serializer.task_spec_converters import NoneTaskConverter, \
     ManualTaskConverter, UserTaskConverter, ScriptTaskConverter, \
     SubWorkflowTaskConverter, TransactionSubprocessConverter, \
     CallActivityTaskConverter, \
@@ -11,7 +11,7 @@ from SpiffWorkflow.spiff.serializer import NoneTaskConverter, \
     IntermediateCatchEventConverter, IntermediateThrowEventConverter, \
     ServiceTaskConverter
 from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase