diff --git a/pt2d/__init__.py b/pt2d/__init__.py
index f15a7c960bd7192ca1c6c06523f667e8e1785079..780df309b6de664859cb4cee0984d58cde2f9372 100644
--- a/pt2d/__init__.py
+++ b/pt2d/__init__.py
@@ -1,6 +1,6 @@
 import sys
 from PyQt5.QtWidgets import QApplication
-from .mainWindow import MainWindow
+from .gui.mainWindow import MainWindow
 
 def main():
     app = QApplication(sys.argv)
diff --git a/pt2d/advancedSettingsWidget.py b/pt2d/gui/advancedSettingsWidget.py
similarity index 100%
rename from pt2d/advancedSettingsWidget.py
rename to pt2d/gui/advancedSettingsWidget.py
diff --git a/pt2d/circleEditorGraphicsView.py b/pt2d/gui/circleEditorGraphicsView.py
similarity index 100%
rename from pt2d/circleEditorGraphicsView.py
rename to pt2d/gui/circleEditorGraphicsView.py
diff --git a/pt2d/circleEditorWidget.py b/pt2d/gui/circleEditorWidget.py
similarity index 100%
rename from pt2d/circleEditorWidget.py
rename to pt2d/gui/circleEditorWidget.py
diff --git a/pt2d/draggableCircleItem.py b/pt2d/gui/draggableCircleItem.py
similarity index 100%
rename from pt2d/draggableCircleItem.py
rename to pt2d/gui/draggableCircleItem.py
diff --git a/pt2d/imageGraphicsView.py b/pt2d/gui/imageGraphicsView.py
similarity index 99%
rename from pt2d/imageGraphicsView.py
rename to pt2d/gui/imageGraphicsView.py
index 77bb7bb9cc93b3efab5df50de005ff38f3814405..6699ac4550d36485ccde3b148180266bb952328f 100644
--- a/pt2d/imageGraphicsView.py
+++ b/pt2d/gui/imageGraphicsView.py
@@ -6,7 +6,7 @@ import math
 import numpy as np
 from .panZoomGraphicsView import PanZoomGraphicsView
 from .labeledPointItem import LabeledPointItem
-from .find_path import find_path
+from ..find_path import find_path
 
 
 class ImageGraphicsView(PanZoomGraphicsView):
diff --git a/pt2d/labeledPointItem.py b/pt2d/gui/labeledPointItem.py
similarity index 100%
rename from pt2d/labeledPointItem.py
rename to pt2d/gui/labeledPointItem.py
diff --git a/pt2d/mainWindow.py b/pt2d/gui/mainWindow.py
similarity index 99%
rename from pt2d/mainWindow.py
rename to pt2d/gui/mainWindow.py
index 94dd3239d8060017840dca4cca7748a04f2d79b1..f706247a4caaf3d2be633c6f009d851c5ec72da1 100644
--- a/pt2d/mainWindow.py
+++ b/pt2d/gui/mainWindow.py
@@ -5,8 +5,8 @@ from PyQt5.QtWidgets import (
     QVBoxLayout, QWidget, QFileDialog
 )
 from PyQt5.QtGui import QPixmap, QImage, QCloseEvent
-from .compute_cost_image import compute_cost_image
-from .preprocess_image import preprocess_image
+from ..compute_cost_image import compute_cost_image
+from ..preprocess_image import preprocess_image
 from .advancedSettingsWidget import AdvancedSettingsWidget
 from .imageGraphicsView import ImageGraphicsView
 from .circleEditorWidget import CircleEditorWidget
diff --git a/pt2d/panZoomGraphicsView.py b/pt2d/gui/panZoomGraphicsView.py
similarity index 100%
rename from pt2d/panZoomGraphicsView.py
rename to pt2d/gui/panZoomGraphicsView.py