diff --git a/manuskript/ui/__init__.py b/manuskript/ui/__init__.py
index 55439777..0e8dd25e 100644
--- a/manuskript/ui/__init__.py
+++ b/manuskript/ui/__init__.py
@@ -3,15 +3,4 @@
 
 from manuskript.ui.util import pixbufFromColor
 
-from manuskript.ui.generalView import GeneralView
-from manuskript.ui.summaryView import SummaryView
-from manuskript.ui.charactersView import CharactersView
-from manuskript.ui.plotView import PlotView
-from manuskript.ui.worldView import WorldView
-from manuskript.ui.outlineView import OutlineView
-from manuskript.ui.editorView import EditorView
-
 from manuskript.ui.mainWindow import MainWindow
-
-
-
diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py
index 01787430..0eba05ca 100644
--- a/manuskript/ui/mainWindow.py
+++ b/manuskript/ui/mainWindow.py
@@ -11,7 +11,7 @@ from gi.repository import Gtk, Handy
 Handy.init()
 
 from manuskript.data import Project
-from manuskript.ui import GeneralView, SummaryView, CharactersView, PlotView, WorldView, OutlineView, EditorView
+from manuskript.ui.views import *
 
 
 class MainWindow:
diff --git a/manuskript/ui/views/__init__.py b/manuskript/ui/views/__init__.py
new file mode 100644
index 00000000..3d24764f
--- /dev/null
+++ b/manuskript/ui/views/__init__.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from manuskript.ui.views.generalView import GeneralView
+
+from manuskript.ui.views.charactersView import CharactersView
+from manuskript.ui.views.editorView import EditorView
+from manuskript.ui.views.outlineView import OutlineView
+from manuskript.ui.views.plotView import PlotView
+from manuskript.ui.views.summaryView import SummaryView
+from manuskript.ui.views.worldView import WorldView
diff --git a/manuskript/ui/charactersView.py b/manuskript/ui/views/charactersView.py
similarity index 100%
rename from manuskript/ui/charactersView.py
rename to manuskript/ui/views/charactersView.py
diff --git a/manuskript/ui/editorView.py b/manuskript/ui/views/editorView.py
similarity index 100%
rename from manuskript/ui/editorView.py
rename to manuskript/ui/views/editorView.py
diff --git a/manuskript/ui/generalView.py b/manuskript/ui/views/generalView.py
similarity index 100%
rename from manuskript/ui/generalView.py
rename to manuskript/ui/views/generalView.py
diff --git a/manuskript/ui/outlineView.py b/manuskript/ui/views/outlineView.py
similarity index 100%
rename from manuskript/ui/outlineView.py
rename to manuskript/ui/views/outlineView.py
diff --git a/manuskript/ui/plotView.py b/manuskript/ui/views/plotView.py
similarity index 100%
rename from manuskript/ui/plotView.py
rename to manuskript/ui/views/plotView.py
diff --git a/manuskript/ui/summaryView.py b/manuskript/ui/views/summaryView.py
similarity index 99%
rename from manuskript/ui/summaryView.py
rename to manuskript/ui/views/summaryView.py
index 2d2eeb39..7374a946 100644
--- a/manuskript/ui/summaryView.py
+++ b/manuskript/ui/views/summaryView.py
@@ -25,30 +25,29 @@ class SummaryView:
         self.stackCombo.connect("changed", self.summaryStackChanged)
 
         self.situationBuffer = builder.get_object("situation")
-        self.situationBuffer.set_text(validString(self.summary.situation), -1)
-
-        self.oneSentenceBuffer = builder.get_object("summary_one_sentence")
-        self.oneSentenceBuffer.set_text(validString(self.summary.sentence), -1)
-        self.oneSentenceLabel = builder.get_object("one_sentence_label")
-
-        self.oneParagraphBuffer = builder.get_object("summary_one_paragraph")
-        self.oneParagraphBuffer.set_text(validString(self.summary.paragraph), -1)
-        self.oneParagraphLabel = builder.get_object("one_paragraph_label")
-
-        self.onePageBuffer = builder.get_object("summary_one_page")
-        self.onePageBuffer.set_text(validString(self.summary.page), -1)
-        self.onePageLabel = builder.get_object("one_page_label")
-
-        self.fullBuffer = builder.get_object("summary_full")
-        self.fullBuffer.set_text(validString(self.summary.full), -1)
-        self.fullLabel = builder.get_object("full_label")
-
         self.situationBuffer.connect("deleted-text", self._situationDeletedText)
         self.situationBuffer.connect("inserted-text", self._situationInsertedText)
+        self.situationBuffer.set_text(validString(self.summary.situation), -1)
+
+        self.oneSentenceLabel = builder.get_object("one_sentence_label")
+        self.oneSentenceBuffer = builder.get_object("summary_one_sentence")
         self.oneSentenceBuffer.connect("changed", self.summaryOneSentenceChanged)
+        self.oneSentenceBuffer.set_text(validString(self.summary.sentence), -1)
+
+        self.oneParagraphLabel = builder.get_object("one_paragraph_label")
+        self.oneParagraphBuffer = builder.get_object("summary_one_paragraph")
         self.oneParagraphBuffer.connect("changed", self.summaryOneParagraphChanged)
+        self.oneParagraphBuffer.set_text(validString(self.summary.paragraph), -1)
+
+        self.onePageLabel = builder.get_object("one_page_label")
+        self.onePageBuffer = builder.get_object("summary_one_page")
         self.onePageBuffer.connect("changed", self.summaryOnePageChanged)
+        self.onePageBuffer.set_text(validString(self.summary.page), -1)
+
+        self.fullLabel = builder.get_object("full_label")
+        self.fullBuffer = builder.get_object("summary_full")
         self.fullBuffer.connect("changed", self.summaryFullChanged)
+        self.fullBuffer.set_text(validString(self.summary.full), -1)
 
         self.nextButton = builder.get_object("next_button")
         self.nextButton.connect("clicked", self.nextClicked)
diff --git a/manuskript/ui/worldView.py b/manuskript/ui/views/worldView.py
similarity index 100%
rename from manuskript/ui/worldView.py
rename to manuskript/ui/views/worldView.py