diff --git a/ContainerWidgets.py b/ContainerWidgets.py
index e21775a..881f8e2 100644
--- a/ContainerWidgets.py
+++ b/ContainerWidgets.py
@@ -1,15 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from gui import ConductivityGroupBox, PeakGroupBox, StaticGroupBox, PowerLawGroupBox, YAFFparameters, YAFFConfig
+
 __author__ = 'markusro'
 
-from PyQt4.QtGui import QGroupBox, QPalette, QColor
-import ConductivityGroupBox
-import PeakGroupBox
-import PowerLawGroupBox
-import StaticGroupBox
-import YAFFparameters, YAFFConfig
-
-
 from PyQt4.QtGui import *
 from PyQt4.QtCore import QRegExp, pyqtSignal,pyqtSlot
 
diff --git a/Makefile b/Makefile
index a304dd2..3c99346 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 all:
 	pyrcc4 icons/images.qrc -o images_rc.py
-	pyuic4 QDSMain.ui -o QDSMain.py
-	pyuic4 PeakGroupBox.ui -o PeakGroupBox.py
-	pyuic4 ConductivityGroupBox.ui -o ConductivityGroupBox.py
-	pyuic4 PowerLawGroupBox.ui -o PowerLawGroupBox.py
-	pyuic4 StaticGroupBox.ui -o StaticGroupBox.py
-	pyuic4 YAFFparameters.ui -o YAFFparameters.py
-	pyuic4 YAFFConfig.ui -o YAFFConfig.py
-	pyuic4 ExtraDifferential.ui -o ExtraDifferential.py
+	pyuic4 gui/QDSMain.ui -o gui/QDSMain.py
+	pyuic4 gui/PeakGroupBox.ui -o gui/PeakGroupBox.py
+	pyuic4 gui/ConductivityGroupBox.ui -o gui/ConductivityGroupBox.py
+	pyuic4 gui/PowerLawGroupBox.ui -o gui/PowerLawGroupBox.py
+	pyuic4 gui/StaticGroupBox.ui -o gui/StaticGroupBox.py
+	pyuic4 gui/YAFFparameters.ui -o gui/YAFFparameters.py
+	pyuic4 gui/YAFFConfig.ui -o gui/YAFFConfig.py
+	pyuic4 gui/ExtraDifferential.ui -o gui/ExtraDifferential.py
 stats:
 	wc -l QDS.py ContainerWidgets.py Container.py libyaff.py Mathlib.py Data.py
diff --git a/QDS.py b/QDS.py
index 1b6c1bb..8ea7d17 100755
--- a/QDS.py
+++ b/QDS.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
+from gui import QDSMain, ExtraDifferentialWidget
+
 _author_ = "Markus Rosenstihl"
 
 import hashlib,uuid
@@ -25,8 +27,6 @@ from ContainerWidgets import ParameterWidget
 from BDSMathlib import FunctionRegister, FitRoutine
 from Data import Data
 
-import QDSMain
-import ExtraDifferentialWidget
 
 class AppWindow(QMainWindow):
     def __init__(self, files=[], parent=None):
diff --git a/ConductivityGroupBox.py b/gui/ConductivityGroupBox.py
similarity index 100%
rename from ConductivityGroupBox.py
rename to gui/ConductivityGroupBox.py
diff --git a/ConductivityGroupBox.ui b/gui/ConductivityGroupBox.ui
similarity index 100%
rename from ConductivityGroupBox.ui
rename to gui/ConductivityGroupBox.ui
diff --git a/ExtraDifferential.ui b/gui/ExtraDifferential.ui
similarity index 100%
rename from ExtraDifferential.ui
rename to gui/ExtraDifferential.ui
diff --git a/ExtraDifferentialWidget.py b/gui/ExtraDifferentialWidget.py
similarity index 100%
rename from ExtraDifferentialWidget.py
rename to gui/ExtraDifferentialWidget.py
diff --git a/PeakGroupBox.py b/gui/PeakGroupBox.py
similarity index 100%
rename from PeakGroupBox.py
rename to gui/PeakGroupBox.py
diff --git a/PeakGroupBox.ui b/gui/PeakGroupBox.ui
similarity index 100%
rename from PeakGroupBox.ui
rename to gui/PeakGroupBox.ui
diff --git a/PowerLawGroupBox.py b/gui/PowerLawGroupBox.py
similarity index 100%
rename from PowerLawGroupBox.py
rename to gui/PowerLawGroupBox.py
diff --git a/PowerLawGroupBox.ui b/gui/PowerLawGroupBox.ui
similarity index 100%
rename from PowerLawGroupBox.ui
rename to gui/PowerLawGroupBox.ui
diff --git a/QDSMain.py b/gui/QDSMain.py
similarity index 100%
rename from QDSMain.py
rename to gui/QDSMain.py
diff --git a/QDSMain.ui b/gui/QDSMain.ui
similarity index 100%
rename from QDSMain.ui
rename to gui/QDSMain.ui
diff --git a/StaticGroupBox.py b/gui/StaticGroupBox.py
similarity index 100%
rename from StaticGroupBox.py
rename to gui/StaticGroupBox.py
diff --git a/StaticGroupBox.ui b/gui/StaticGroupBox.ui
similarity index 100%
rename from StaticGroupBox.ui
rename to gui/StaticGroupBox.ui
diff --git a/YAFFConfig.py b/gui/YAFFConfig.py
similarity index 100%
rename from YAFFConfig.py
rename to gui/YAFFConfig.py
diff --git a/YAFFConfig.ui b/gui/YAFFConfig.ui
similarity index 100%
rename from YAFFConfig.ui
rename to gui/YAFFConfig.ui
diff --git a/YAFFparameters.py b/gui/YAFFparameters.py
similarity index 100%
rename from YAFFparameters.py
rename to gui/YAFFparameters.py
diff --git a/YAFFparameters.ui b/gui/YAFFparameters.ui
similarity index 100%
rename from YAFFparameters.ui
rename to gui/YAFFparameters.ui