diff --git a/spiff_example/cli/__init__.py b/app/cli/__init__.py
similarity index 59%
rename from spiff_example/cli/__init__.py
rename to app/cli/__init__.py
index a423ca0..28a0e8a 100644
--- a/spiff_example/cli/__init__.py
+++ b/app/cli/__init__.py
@@ -1 +1,2 @@
 from .subcommands import add_subparsers, configure_logging
+from .ui import CursesUI, CursesUIError
diff --git a/spiff_example/curses_ui/content.py b/app/cli/content.py
similarity index 100%
rename from spiff_example/curses_ui/content.py
rename to app/cli/content.py
diff --git a/spiff_example/cli/diff_result.py b/app/cli/diff_result.py
similarity index 100%
rename from spiff_example/cli/diff_result.py
rename to app/cli/diff_result.py
diff --git a/spiff_example/curses_ui/human_task_handler.py b/app/cli/human_task_handler.py
similarity index 100%
rename from spiff_example/curses_ui/human_task_handler.py
rename to app/cli/human_task_handler.py
diff --git a/spiff_example/curses_ui/list_view.py b/app/cli/list_view.py
similarity index 100%
rename from spiff_example/curses_ui/list_view.py
rename to app/cli/list_view.py
diff --git a/spiff_example/curses_ui/log_view.py b/app/cli/log_view.py
similarity index 100%
rename from spiff_example/curses_ui/log_view.py
rename to app/cli/log_view.py
diff --git a/spiff_example/curses_ui/menu.py b/app/cli/menu.py
similarity index 100%
rename from spiff_example/curses_ui/menu.py
rename to app/cli/menu.py
diff --git a/spiff_example/curses_ui/spec_view.py b/app/cli/spec_view.py
similarity index 100%
rename from spiff_example/curses_ui/spec_view.py
rename to app/cli/spec_view.py
diff --git a/spiff_example/cli/subcommands.py b/app/cli/subcommands.py
similarity index 100%
rename from spiff_example/cli/subcommands.py
rename to app/cli/subcommands.py
diff --git a/spiff_example/curses_ui/task_filter_view.py b/app/cli/task_filter_view.py
similarity index 100%
rename from spiff_example/curses_ui/task_filter_view.py
rename to app/cli/task_filter_view.py
diff --git a/spiff_example/curses_ui/ui.py b/app/cli/ui.py
similarity index 100%
rename from spiff_example/curses_ui/ui.py
rename to app/cli/ui.py
diff --git a/spiff_example/curses_ui/user_input.py b/app/cli/user_input.py
similarity index 100%
rename from spiff_example/curses_ui/user_input.py
rename to app/cli/user_input.py
diff --git a/spiff_example/curses_ui/workflow_view.py b/app/cli/workflow_view.py
similarity index 100%
rename from spiff_example/curses_ui/workflow_view.py
rename to app/cli/workflow_view.py
diff --git a/runner.py b/runner.py
index d8e4178..7d72826 100755
--- a/runner.py
+++ b/runner.py
@@ -5,8 +5,7 @@
 import sys, traceback
 from argparse import ArgumentParser
 
-from spiff_example.curses_ui import CursesUI, CursesUIError
-from spiff_example.cli import add_subparsers, configure_logging
+from app.cli import add_subparsers, configure_logging, CursesUI, CursesUIError
 
 if __name__ == '__main__':
 
diff --git a/spiff_example/camunda/curses_handlers.py b/spiff_example/camunda/curses_handlers.py
index 9621f73..d06fc71 100644
--- a/spiff_example/camunda/curses_handlers.py
+++ b/spiff_example/camunda/curses_handlers.py
@@ -3,8 +3,8 @@
 from SpiffWorkflow.util.deep_merge import DeepMerge
 from SpiffWorkflow.camunda.specs.user_task import EnumFormField
 
-from ..curses_ui.user_input import Field, Option, SimpleField
-from ..curses_ui.human_task_handler import TaskHandler
+from app.cli.user_input import Field, Option, SimpleField
+from app.cli.human_task_handler import TaskHandler
 
 class CamundaTaskHandler(TaskHander):
 
diff --git a/spiff_example/curses_ui/__init__.py b/spiff_example/curses_ui/__init__.py
deleted file mode 100644
index ff09843..0000000
--- a/spiff_example/curses_ui/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .ui import CursesUI, CursesUIError
diff --git a/spiff_example/spiff/curses_handlers.py b/spiff_example/spiff/curses_handlers.py
index 05827e1..739f9be 100644
--- a/spiff_example/spiff/curses_handlers.py
+++ b/spiff_example/spiff/curses_handlers.py
@@ -3,8 +3,8 @@
 
 from jinja2 import Template
 
-from ..curses_ui.user_input import SimpleField, Option, JsonField
-from ..curses_ui.human_task_handler import TaskHandler
+from app.cli.user_input import SimpleField, Option, JsonField
+from app.cli.human_task_handler import TaskHandler
 
 forms_dir = 'bpmn/tutorial/forms'