diff --git a/generate_class_files_from_ui_files.sh b/generate_class_files_from_ui_files.sh
index 119d806..f31f768 100755
--- a/generate_class_files_from_ui_files.sh
+++ b/generate_class_files_from_ui_files.sh
@@ -1,9 +1,9 @@
#!/bin/bash
-for file in $(ls ./src/ui)
+for file in $(ls ./src/gui/ui)
do
output_file=$(echo $file | sed -e 's/\..*$//')
-pipenv run python -m PyQt5.uic.pyuic -x ./src/ui/$file -o ./src/python/ui/$output_file'_ui.py'
+pipenv run python -m PyQt5.uic.pyuic -x ./src/gui/ui/$file -o ./src/python/ui/$output_file'_ui.py'
done;
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 0000000..6bda3f8
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+pipenv run python -m unittest discover -s ./tests/ -p 'test_*.py'
+
+
diff --git a/src/gui/__init__.py b/src/gui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/gui/images/__init__.py b/src/gui/images/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/images/mainwindow.png b/src/gui/images/mainwindow.png
similarity index 100%
rename from src/images/mainwindow.png
rename to src/gui/images/mainwindow.png
diff --git a/src/gui/ui/__init__.py b/src/gui/ui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/ui/mainwindow.ui b/src/gui/ui/mainwindow.ui
similarity index 98%
rename from src/ui/mainwindow.ui
rename to src/gui/ui/mainwindow.ui
index 99c0aa3..275e1c8 100644
--- a/src/ui/mainwindow.ui
+++ b/src/gui/ui/mainwindow.ui
@@ -20,10 +20,7 @@
540
-
-
- QLayout::SetDefaultConstraint
-
+
-
-
@@ -258,7 +255,6 @@
h_line
h_line3
h_slider
- verticalLayoutWidget