From 9b936c44c62a2bc8abe693fca9050c2a5c4e34b3 Mon Sep 17 00:00:00 2001
From: Bastian Leykauf <leykauf@physik.hu-berlin.de>
Date: Thu, 2 Jun 2022 14:31:05 +0200
Subject: [PATCH] chore: move files to new locations.

---
 .gitignore                                    |   1 -
 MANIFEST.in                                   |   2 -
 {scripts => gateware}/bit2bin.py              |   0
 {scripts => gateware}/build_fpga_image.sh     |   0
 {scripts => gateware}/fpga_image_helper.py    |   0
 {verilog => gateware/verilog}/axi_slave.v     |   0
 .../verilog}/bus_clk_bridge.v                 |   0
 ...ocessing_system7_v5_4_processing_system7.v |   0
 .../verilog}/red_pitaya_scope.v               |   0
 .../verilog}/system_processing_system7_0_0.v  |   0
 .../system_processing_system7_0_0.xdc         |   0
 .../linien}/client/__init__.py                |   0
 .../linien}/client/connection.py              |   0
 .../linien}/client/exceptions.py              |   0
 .../linien}/client/remote_parameters.py       |   0
 .../linien}/client/utils.py                   |   0
 .../linien-client/requirements.txt            |  10 ++--
 .../linien-client/setup.py                    |   0
 linien/{ => linien-common/linien}/common.py   |   0
 linien/{ => linien-common/linien}/config.py   |   0
 .../linien-gui}/build_standalone_client.sh    |   0
 .../{ => linien-gui/linien}/gui/__init__.py   |   0
 linien/{ => linien-gui/linien}/gui/app.py     |   0
 linien/{ => linien-gui/linien}/gui/config.py  |   0
 linien/{ => linien-gui/linien}/gui/dialogs.py |   0
 linien/{ => linien-gui/linien}/gui/icon.ico   | Bin
 .../linien}/gui/ui/__init__.py                |   0
 .../linien}/gui/ui/device_manager.py          |   0
 .../linien}/gui/ui/device_manager.ui          |   0
 .../linien}/gui/ui/general_panel.py           |   0
 .../linien}/gui/ui/general_panel.ui           |   0
 .../linien}/gui/ui/lock_status_panel.py       |   0
 .../linien}/gui/ui/locking_panel.py           |   0
 .../linien}/gui/ui/locking_panel.ui           |   0
 .../linien}/gui/ui/main_window.py             |   0
 .../linien}/gui/ui/main_window.ui             |   0
 .../linien}/gui/ui/modulation_sweep_panel.py  |   0
 .../linien}/gui/ui/modulation_sweep_panel.ui  |   0
 .../linien}/gui/ui/new_device_dialog.py       |   0
 .../linien}/gui/ui/new_device_dialog.ui       |   0
 .../linien}/gui/ui/optimization_panel.py      |   0
 .../linien}/gui/ui/optimization_panel.ui      |   0
 .../linien}/gui/ui/plot_widget.py             |   0
 .../linien}/gui/ui/psd_plot_widget.py         |   0
 .../linien}/gui/ui/psd_table_widget.py        |   0
 .../linien}/gui/ui/psd_window.py              |   0
 .../linien}/gui/ui/psd_window.ui              |   0
 .../linien}/gui/ui/right_panel.py             |   0
 .../linien}/gui/ui/spectroscopy_panel.py      |   0
 .../linien}/gui/ui/spectroscopy_panel.ui      |   0
 .../linien}/gui/ui/spin_box.py                |   0
 .../linien}/gui/ui/sweep_control.py           |   0
 .../linien}/gui/ui/version_checker.py         |   0
 .../linien}/gui/ui/view_panel.py              |   0
 .../linien}/gui/ui/view_panel.ui              |   0
 .../{ => linien-gui/linien}/gui/utils_gui.py  |   0
 linien/{ => linien-gui/linien}/gui/widgets.py |   0
 .../linien-gui/pyinstaller.spec               |   0
 .../linien-gui/requirements.txt               |  44 +++++++++---------
 setup_gui.py => linien/linien-gui/setup.py    |   0
 .../linien}/server/acquisition.py             |   0
 .../linien}/server/acquisition_process.py     |   0
 .../linien}/server/approach_line.py           |   0
 .../linien}/server/autolock/__init__.py       |   0
 .../server/autolock/algorithm_selection.py    |   0
 .../linien}/server/autolock/autolock.py       |   0
 .../linien}/server/autolock/fast.py           |   0
 .../linien}/server/autolock/robust.py         |   0
 .../linien}/server/autolock/utils.py          |   0
 .../{ => linien-server/linien}/server/csr.py  |   0
 .../linien}/server/csrmap.py                  |   0
 .../linien}/server/iir_coeffs.py              |   0
 .../linien}/server/linien.bin                 |   0
 .../server/linien_install_requirements.sh     |   0
 .../server/linien_start_ethernet_blinking.sh  |   0
 .../linien}/server/linien_start_server.sh     |   0
 .../server/linien_stop_ethernet_blinking.sh   |   0
 .../linien}/server/linien_stop_server.sh      |   0
 .../linien}/server/optimization/__init__.py   |   0
 .../linien}/server/optimization/engine.py     |   0
 .../linien}/server/optimization/general.py    |   0
 .../server/optimization/optimization.py       |   0
 .../linien}/server/optimization/utils.py      |   0
 .../linien}/server/parameter_store.py         |   0
 .../linien}/server/parameters.py              |   0
 .../linien}/server/parameters_base.py         |   0
 .../server/pid_optimization/__init__.py       |   0
 .../pid_optimization/pid_optimization.py      |   0
 .../linien}/server/registers.py               |   0
 .../linien}/server/server.py                  |   0
 .../linien}/server/utils.py                   |   0
 .../linien-server/requirements.txt            |   0
 .../linien-server/setup.py                    |   0
 {scripts => linien}/upload_pypi.sh            |   0
 requirements_dev.txt => requirements.txt      |   0
 95 files changed, 27 insertions(+), 30 deletions(-)
 delete mode 100644 MANIFEST.in
 rename {scripts => gateware}/bit2bin.py (100%)
 mode change 100755 => 100644
 rename {scripts => gateware}/build_fpga_image.sh (100%)
 mode change 100755 => 100644
 rename {scripts => gateware}/fpga_image_helper.py (100%)
 mode change 100755 => 100644
 rename {verilog => gateware/verilog}/axi_slave.v (100%)
 rename {verilog => gateware/verilog}/bus_clk_bridge.v (100%)
 rename {verilog => gateware/verilog}/processing_system7_v5_4_processing_system7.v (100%)
 rename {verilog => gateware/verilog}/red_pitaya_scope.v (100%)
 rename {verilog => gateware/verilog}/system_processing_system7_0_0.v (100%)
 rename {verilog => gateware/verilog}/system_processing_system7_0_0.xdc (100%)
 rename linien/{ => linien-client/linien}/client/__init__.py (100%)
 rename linien/{ => linien-client/linien}/client/connection.py (100%)
 rename linien/{ => linien-client/linien}/client/exceptions.py (100%)
 rename linien/{ => linien-client/linien}/client/remote_parameters.py (100%)
 rename linien/{ => linien-client/linien}/client/utils.py (100%)
 rename requirements_client.txt => linien/linien-client/requirements.txt (94%)
 rename setup_client.py => linien/linien-client/setup.py (100%)
 rename linien/{ => linien-common/linien}/common.py (100%)
 rename linien/{ => linien-common/linien}/config.py (100%)
 rename {scripts => linien/linien-gui}/build_standalone_client.sh (100%)
 mode change 100755 => 100644
 rename linien/{ => linien-gui/linien}/gui/__init__.py (100%)
 rename linien/{ => linien-gui/linien}/gui/app.py (100%)
 rename linien/{ => linien-gui/linien}/gui/config.py (100%)
 rename linien/{ => linien-gui/linien}/gui/dialogs.py (100%)
 rename linien/{ => linien-gui/linien}/gui/icon.ico (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/__init__.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/device_manager.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/device_manager.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/general_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/general_panel.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/lock_status_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/locking_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/locking_panel.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/main_window.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/main_window.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/modulation_sweep_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/modulation_sweep_panel.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/new_device_dialog.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/new_device_dialog.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/optimization_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/optimization_panel.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/plot_widget.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/psd_plot_widget.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/psd_table_widget.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/psd_window.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/psd_window.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/right_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/spectroscopy_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/spectroscopy_panel.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/spin_box.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/sweep_control.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/version_checker.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/view_panel.py (100%)
 rename linien/{ => linien-gui/linien}/gui/ui/view_panel.ui (100%)
 rename linien/{ => linien-gui/linien}/gui/utils_gui.py (100%)
 rename linien/{ => linien-gui/linien}/gui/widgets.py (100%)
 rename pyinstaller.spec => linien/linien-gui/pyinstaller.spec (100%)
 rename requirements_gui.txt => linien/linien-gui/requirements.txt (94%)
 rename setup_gui.py => linien/linien-gui/setup.py (100%)
 rename linien/{ => linien-server/linien}/server/acquisition.py (100%)
 rename linien/{ => linien-server/linien}/server/acquisition_process.py (100%)
 rename linien/{ => linien-server/linien}/server/approach_line.py (100%)
 rename linien/{ => linien-server/linien}/server/autolock/__init__.py (100%)
 rename linien/{ => linien-server/linien}/server/autolock/algorithm_selection.py (100%)
 rename linien/{ => linien-server/linien}/server/autolock/autolock.py (100%)
 rename linien/{ => linien-server/linien}/server/autolock/fast.py (100%)
 rename linien/{ => linien-server/linien}/server/autolock/robust.py (100%)
 rename linien/{ => linien-server/linien}/server/autolock/utils.py (100%)
 rename linien/{ => linien-server/linien}/server/csr.py (100%)
 rename linien/{ => linien-server/linien}/server/csrmap.py (100%)
 rename linien/{ => linien-server/linien}/server/iir_coeffs.py (100%)
 rename linien/{ => linien-server/linien}/server/linien.bin (100%)
 rename linien/{ => linien-server/linien}/server/linien_install_requirements.sh (100%)
 rename linien/{ => linien-server/linien}/server/linien_start_ethernet_blinking.sh (100%)
 rename linien/{ => linien-server/linien}/server/linien_start_server.sh (100%)
 rename linien/{ => linien-server/linien}/server/linien_stop_ethernet_blinking.sh (100%)
 rename linien/{ => linien-server/linien}/server/linien_stop_server.sh (100%)
 rename linien/{ => linien-server/linien}/server/optimization/__init__.py (100%)
 rename linien/{ => linien-server/linien}/server/optimization/engine.py (100%)
 rename linien/{ => linien-server/linien}/server/optimization/general.py (100%)
 rename linien/{ => linien-server/linien}/server/optimization/optimization.py (100%)
 rename linien/{ => linien-server/linien}/server/optimization/utils.py (100%)
 rename linien/{ => linien-server/linien}/server/parameter_store.py (100%)
 rename linien/{ => linien-server/linien}/server/parameters.py (100%)
 rename linien/{ => linien-server/linien}/server/parameters_base.py (100%)
 rename linien/{ => linien-server/linien}/server/pid_optimization/__init__.py (100%)
 rename linien/{ => linien-server/linien}/server/pid_optimization/pid_optimization.py (100%)
 rename linien/{ => linien-server/linien}/server/registers.py (100%)
 rename linien/{ => linien-server/linien}/server/server.py (100%)
 rename linien/{ => linien-server/linien}/server/utils.py (100%)
 rename requirements_server.txt => linien/linien-server/requirements.txt (100%)
 rename setup_server.py => linien/linien-server/setup.py (100%)
 rename {scripts => linien}/upload_pypi.sh (100%)
 mode change 100755 => 100644
 rename requirements_dev.txt => requirements.txt (100%)

diff --git a/.gitignore b/.gitignore
index 6f99f7bd..28a1343c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ __pycache__
 /*.v
 /dist
 .eggs
-linien-*
 
 .mypy_cache
 .vscode
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index c47af667..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-recursive-exclude test *
-recursive-exclude gateware *
\ No newline at end of file
diff --git a/scripts/bit2bin.py b/gateware/bit2bin.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/bit2bin.py
rename to gateware/bit2bin.py
diff --git a/scripts/build_fpga_image.sh b/gateware/build_fpga_image.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/build_fpga_image.sh
rename to gateware/build_fpga_image.sh
diff --git a/scripts/fpga_image_helper.py b/gateware/fpga_image_helper.py
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/fpga_image_helper.py
rename to gateware/fpga_image_helper.py
diff --git a/verilog/axi_slave.v b/gateware/verilog/axi_slave.v
similarity index 100%
rename from verilog/axi_slave.v
rename to gateware/verilog/axi_slave.v
diff --git a/verilog/bus_clk_bridge.v b/gateware/verilog/bus_clk_bridge.v
similarity index 100%
rename from verilog/bus_clk_bridge.v
rename to gateware/verilog/bus_clk_bridge.v
diff --git a/verilog/processing_system7_v5_4_processing_system7.v b/gateware/verilog/processing_system7_v5_4_processing_system7.v
similarity index 100%
rename from verilog/processing_system7_v5_4_processing_system7.v
rename to gateware/verilog/processing_system7_v5_4_processing_system7.v
diff --git a/verilog/red_pitaya_scope.v b/gateware/verilog/red_pitaya_scope.v
similarity index 100%
rename from verilog/red_pitaya_scope.v
rename to gateware/verilog/red_pitaya_scope.v
diff --git a/verilog/system_processing_system7_0_0.v b/gateware/verilog/system_processing_system7_0_0.v
similarity index 100%
rename from verilog/system_processing_system7_0_0.v
rename to gateware/verilog/system_processing_system7_0_0.v
diff --git a/verilog/system_processing_system7_0_0.xdc b/gateware/verilog/system_processing_system7_0_0.xdc
similarity index 100%
rename from verilog/system_processing_system7_0_0.xdc
rename to gateware/verilog/system_processing_system7_0_0.xdc
diff --git a/linien/client/__init__.py b/linien/linien-client/linien/client/__init__.py
similarity index 100%
rename from linien/client/__init__.py
rename to linien/linien-client/linien/client/__init__.py
diff --git a/linien/client/connection.py b/linien/linien-client/linien/client/connection.py
similarity index 100%
rename from linien/client/connection.py
rename to linien/linien-client/linien/client/connection.py
diff --git a/linien/client/exceptions.py b/linien/linien-client/linien/client/exceptions.py
similarity index 100%
rename from linien/client/exceptions.py
rename to linien/linien-client/linien/client/exceptions.py
diff --git a/linien/client/remote_parameters.py b/linien/linien-client/linien/client/remote_parameters.py
similarity index 100%
rename from linien/client/remote_parameters.py
rename to linien/linien-client/linien/client/remote_parameters.py
diff --git a/linien/client/utils.py b/linien/linien-client/linien/client/utils.py
similarity index 100%
rename from linien/client/utils.py
rename to linien/linien-client/linien/client/utils.py
diff --git a/requirements_client.txt b/linien/linien-client/requirements.txt
similarity index 94%
rename from requirements_client.txt
rename to linien/linien-client/requirements.txt
index 19fa8e55..775533a6 100644
--- a/requirements_client.txt
+++ b/linien/linien-client/requirements.txt
@@ -1,6 +1,6 @@
-numpy==1.21.0
-paramiko==2.10.1
-plumbum==1.6.9
-rpyc==4.1.5
-scipy==1.4.1
+numpy==1.21.0
+paramiko==2.10.1
+plumbum==1.6.9
+rpyc==4.1.5
+scipy==1.4.1
 uuid==1.30
\ No newline at end of file
diff --git a/setup_client.py b/linien/linien-client/setup.py
similarity index 100%
rename from setup_client.py
rename to linien/linien-client/setup.py
diff --git a/linien/common.py b/linien/linien-common/linien/common.py
similarity index 100%
rename from linien/common.py
rename to linien/linien-common/linien/common.py
diff --git a/linien/config.py b/linien/linien-common/linien/config.py
similarity index 100%
rename from linien/config.py
rename to linien/linien-common/linien/config.py
diff --git a/scripts/build_standalone_client.sh b/linien/linien-gui/build_standalone_client.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/build_standalone_client.sh
rename to linien/linien-gui/build_standalone_client.sh
diff --git a/linien/gui/__init__.py b/linien/linien-gui/linien/gui/__init__.py
similarity index 100%
rename from linien/gui/__init__.py
rename to linien/linien-gui/linien/gui/__init__.py
diff --git a/linien/gui/app.py b/linien/linien-gui/linien/gui/app.py
similarity index 100%
rename from linien/gui/app.py
rename to linien/linien-gui/linien/gui/app.py
diff --git a/linien/gui/config.py b/linien/linien-gui/linien/gui/config.py
similarity index 100%
rename from linien/gui/config.py
rename to linien/linien-gui/linien/gui/config.py
diff --git a/linien/gui/dialogs.py b/linien/linien-gui/linien/gui/dialogs.py
similarity index 100%
rename from linien/gui/dialogs.py
rename to linien/linien-gui/linien/gui/dialogs.py
diff --git a/linien/gui/icon.ico b/linien/linien-gui/linien/gui/icon.ico
similarity index 100%
rename from linien/gui/icon.ico
rename to linien/linien-gui/linien/gui/icon.ico
diff --git a/linien/gui/ui/__init__.py b/linien/linien-gui/linien/gui/ui/__init__.py
similarity index 100%
rename from linien/gui/ui/__init__.py
rename to linien/linien-gui/linien/gui/ui/__init__.py
diff --git a/linien/gui/ui/device_manager.py b/linien/linien-gui/linien/gui/ui/device_manager.py
similarity index 100%
rename from linien/gui/ui/device_manager.py
rename to linien/linien-gui/linien/gui/ui/device_manager.py
diff --git a/linien/gui/ui/device_manager.ui b/linien/linien-gui/linien/gui/ui/device_manager.ui
similarity index 100%
rename from linien/gui/ui/device_manager.ui
rename to linien/linien-gui/linien/gui/ui/device_manager.ui
diff --git a/linien/gui/ui/general_panel.py b/linien/linien-gui/linien/gui/ui/general_panel.py
similarity index 100%
rename from linien/gui/ui/general_panel.py
rename to linien/linien-gui/linien/gui/ui/general_panel.py
diff --git a/linien/gui/ui/general_panel.ui b/linien/linien-gui/linien/gui/ui/general_panel.ui
similarity index 100%
rename from linien/gui/ui/general_panel.ui
rename to linien/linien-gui/linien/gui/ui/general_panel.ui
diff --git a/linien/gui/ui/lock_status_panel.py b/linien/linien-gui/linien/gui/ui/lock_status_panel.py
similarity index 100%
rename from linien/gui/ui/lock_status_panel.py
rename to linien/linien-gui/linien/gui/ui/lock_status_panel.py
diff --git a/linien/gui/ui/locking_panel.py b/linien/linien-gui/linien/gui/ui/locking_panel.py
similarity index 100%
rename from linien/gui/ui/locking_panel.py
rename to linien/linien-gui/linien/gui/ui/locking_panel.py
diff --git a/linien/gui/ui/locking_panel.ui b/linien/linien-gui/linien/gui/ui/locking_panel.ui
similarity index 100%
rename from linien/gui/ui/locking_panel.ui
rename to linien/linien-gui/linien/gui/ui/locking_panel.ui
diff --git a/linien/gui/ui/main_window.py b/linien/linien-gui/linien/gui/ui/main_window.py
similarity index 100%
rename from linien/gui/ui/main_window.py
rename to linien/linien-gui/linien/gui/ui/main_window.py
diff --git a/linien/gui/ui/main_window.ui b/linien/linien-gui/linien/gui/ui/main_window.ui
similarity index 100%
rename from linien/gui/ui/main_window.ui
rename to linien/linien-gui/linien/gui/ui/main_window.ui
diff --git a/linien/gui/ui/modulation_sweep_panel.py b/linien/linien-gui/linien/gui/ui/modulation_sweep_panel.py
similarity index 100%
rename from linien/gui/ui/modulation_sweep_panel.py
rename to linien/linien-gui/linien/gui/ui/modulation_sweep_panel.py
diff --git a/linien/gui/ui/modulation_sweep_panel.ui b/linien/linien-gui/linien/gui/ui/modulation_sweep_panel.ui
similarity index 100%
rename from linien/gui/ui/modulation_sweep_panel.ui
rename to linien/linien-gui/linien/gui/ui/modulation_sweep_panel.ui
diff --git a/linien/gui/ui/new_device_dialog.py b/linien/linien-gui/linien/gui/ui/new_device_dialog.py
similarity index 100%
rename from linien/gui/ui/new_device_dialog.py
rename to linien/linien-gui/linien/gui/ui/new_device_dialog.py
diff --git a/linien/gui/ui/new_device_dialog.ui b/linien/linien-gui/linien/gui/ui/new_device_dialog.ui
similarity index 100%
rename from linien/gui/ui/new_device_dialog.ui
rename to linien/linien-gui/linien/gui/ui/new_device_dialog.ui
diff --git a/linien/gui/ui/optimization_panel.py b/linien/linien-gui/linien/gui/ui/optimization_panel.py
similarity index 100%
rename from linien/gui/ui/optimization_panel.py
rename to linien/linien-gui/linien/gui/ui/optimization_panel.py
diff --git a/linien/gui/ui/optimization_panel.ui b/linien/linien-gui/linien/gui/ui/optimization_panel.ui
similarity index 100%
rename from linien/gui/ui/optimization_panel.ui
rename to linien/linien-gui/linien/gui/ui/optimization_panel.ui
diff --git a/linien/gui/ui/plot_widget.py b/linien/linien-gui/linien/gui/ui/plot_widget.py
similarity index 100%
rename from linien/gui/ui/plot_widget.py
rename to linien/linien-gui/linien/gui/ui/plot_widget.py
diff --git a/linien/gui/ui/psd_plot_widget.py b/linien/linien-gui/linien/gui/ui/psd_plot_widget.py
similarity index 100%
rename from linien/gui/ui/psd_plot_widget.py
rename to linien/linien-gui/linien/gui/ui/psd_plot_widget.py
diff --git a/linien/gui/ui/psd_table_widget.py b/linien/linien-gui/linien/gui/ui/psd_table_widget.py
similarity index 100%
rename from linien/gui/ui/psd_table_widget.py
rename to linien/linien-gui/linien/gui/ui/psd_table_widget.py
diff --git a/linien/gui/ui/psd_window.py b/linien/linien-gui/linien/gui/ui/psd_window.py
similarity index 100%
rename from linien/gui/ui/psd_window.py
rename to linien/linien-gui/linien/gui/ui/psd_window.py
diff --git a/linien/gui/ui/psd_window.ui b/linien/linien-gui/linien/gui/ui/psd_window.ui
similarity index 100%
rename from linien/gui/ui/psd_window.ui
rename to linien/linien-gui/linien/gui/ui/psd_window.ui
diff --git a/linien/gui/ui/right_panel.py b/linien/linien-gui/linien/gui/ui/right_panel.py
similarity index 100%
rename from linien/gui/ui/right_panel.py
rename to linien/linien-gui/linien/gui/ui/right_panel.py
diff --git a/linien/gui/ui/spectroscopy_panel.py b/linien/linien-gui/linien/gui/ui/spectroscopy_panel.py
similarity index 100%
rename from linien/gui/ui/spectroscopy_panel.py
rename to linien/linien-gui/linien/gui/ui/spectroscopy_panel.py
diff --git a/linien/gui/ui/spectroscopy_panel.ui b/linien/linien-gui/linien/gui/ui/spectroscopy_panel.ui
similarity index 100%
rename from linien/gui/ui/spectroscopy_panel.ui
rename to linien/linien-gui/linien/gui/ui/spectroscopy_panel.ui
diff --git a/linien/gui/ui/spin_box.py b/linien/linien-gui/linien/gui/ui/spin_box.py
similarity index 100%
rename from linien/gui/ui/spin_box.py
rename to linien/linien-gui/linien/gui/ui/spin_box.py
diff --git a/linien/gui/ui/sweep_control.py b/linien/linien-gui/linien/gui/ui/sweep_control.py
similarity index 100%
rename from linien/gui/ui/sweep_control.py
rename to linien/linien-gui/linien/gui/ui/sweep_control.py
diff --git a/linien/gui/ui/version_checker.py b/linien/linien-gui/linien/gui/ui/version_checker.py
similarity index 100%
rename from linien/gui/ui/version_checker.py
rename to linien/linien-gui/linien/gui/ui/version_checker.py
diff --git a/linien/gui/ui/view_panel.py b/linien/linien-gui/linien/gui/ui/view_panel.py
similarity index 100%
rename from linien/gui/ui/view_panel.py
rename to linien/linien-gui/linien/gui/ui/view_panel.py
diff --git a/linien/gui/ui/view_panel.ui b/linien/linien-gui/linien/gui/ui/view_panel.ui
similarity index 100%
rename from linien/gui/ui/view_panel.ui
rename to linien/linien-gui/linien/gui/ui/view_panel.ui
diff --git a/linien/gui/utils_gui.py b/linien/linien-gui/linien/gui/utils_gui.py
similarity index 100%
rename from linien/gui/utils_gui.py
rename to linien/linien-gui/linien/gui/utils_gui.py
diff --git a/linien/gui/widgets.py b/linien/linien-gui/linien/gui/widgets.py
similarity index 100%
rename from linien/gui/widgets.py
rename to linien/linien-gui/linien/gui/widgets.py
diff --git a/pyinstaller.spec b/linien/linien-gui/pyinstaller.spec
similarity index 100%
rename from pyinstaller.spec
rename to linien/linien-gui/pyinstaller.spec
diff --git a/requirements_gui.txt b/linien/linien-gui/requirements.txt
similarity index 94%
rename from requirements_gui.txt
rename to linien/linien-gui/requirements.txt
index 94ae7622..81057ac4 100644
--- a/requirements_gui.txt
+++ b/linien/linien-gui/requirements.txt
@@ -1,23 +1,23 @@
-altgraph==0.17
-appdirs==1.4.4
-bcrypt==3.2.0
-cffi==1.14.2
-click==8.1.2
-cryptography==3.3.2
-future==0.18.2
-numpy==1.21.0
-paramiko==2.10.1
-pefile==2019.4.18
-plumbum==1.6.9
-pycparser==2.20
-PyNaCl==1.4.0
-PyQt5==5.15.0
-PyQt5-sip==12.8.0
-pyqtgraph==0.11.0
-pywin32-ctypes==0.2.0
-rpyc==4.1.5
-scipy==1.4.1
-six==1.15.0
-uuid==1.30
-superqt==0.2.3
+altgraph==0.17
+appdirs==1.4.4
+bcrypt==3.2.0
+cffi==1.14.2
+click==8.1.2
+cryptography==3.3.2
+future==0.18.2
+numpy==1.21.0
+paramiko==2.10.1
+pefile==2019.4.18
+plumbum==1.6.9
+pycparser==2.20
+PyNaCl==1.4.0
+PyQt5==5.15.0
+PyQt5-sip==12.8.0
+pyqtgraph==0.11.0
+pywin32-ctypes==0.2.0
+rpyc==4.1.5
+scipy==1.4.1
+six==1.15.0
+uuid==1.30
+superqt==0.2.3
 packaging==21.3
\ No newline at end of file
diff --git a/setup_gui.py b/linien/linien-gui/setup.py
similarity index 100%
rename from setup_gui.py
rename to linien/linien-gui/setup.py
diff --git a/linien/server/acquisition.py b/linien/linien-server/linien/server/acquisition.py
similarity index 100%
rename from linien/server/acquisition.py
rename to linien/linien-server/linien/server/acquisition.py
diff --git a/linien/server/acquisition_process.py b/linien/linien-server/linien/server/acquisition_process.py
similarity index 100%
rename from linien/server/acquisition_process.py
rename to linien/linien-server/linien/server/acquisition_process.py
diff --git a/linien/server/approach_line.py b/linien/linien-server/linien/server/approach_line.py
similarity index 100%
rename from linien/server/approach_line.py
rename to linien/linien-server/linien/server/approach_line.py
diff --git a/linien/server/autolock/__init__.py b/linien/linien-server/linien/server/autolock/__init__.py
similarity index 100%
rename from linien/server/autolock/__init__.py
rename to linien/linien-server/linien/server/autolock/__init__.py
diff --git a/linien/server/autolock/algorithm_selection.py b/linien/linien-server/linien/server/autolock/algorithm_selection.py
similarity index 100%
rename from linien/server/autolock/algorithm_selection.py
rename to linien/linien-server/linien/server/autolock/algorithm_selection.py
diff --git a/linien/server/autolock/autolock.py b/linien/linien-server/linien/server/autolock/autolock.py
similarity index 100%
rename from linien/server/autolock/autolock.py
rename to linien/linien-server/linien/server/autolock/autolock.py
diff --git a/linien/server/autolock/fast.py b/linien/linien-server/linien/server/autolock/fast.py
similarity index 100%
rename from linien/server/autolock/fast.py
rename to linien/linien-server/linien/server/autolock/fast.py
diff --git a/linien/server/autolock/robust.py b/linien/linien-server/linien/server/autolock/robust.py
similarity index 100%
rename from linien/server/autolock/robust.py
rename to linien/linien-server/linien/server/autolock/robust.py
diff --git a/linien/server/autolock/utils.py b/linien/linien-server/linien/server/autolock/utils.py
similarity index 100%
rename from linien/server/autolock/utils.py
rename to linien/linien-server/linien/server/autolock/utils.py
diff --git a/linien/server/csr.py b/linien/linien-server/linien/server/csr.py
similarity index 100%
rename from linien/server/csr.py
rename to linien/linien-server/linien/server/csr.py
diff --git a/linien/server/csrmap.py b/linien/linien-server/linien/server/csrmap.py
similarity index 100%
rename from linien/server/csrmap.py
rename to linien/linien-server/linien/server/csrmap.py
diff --git a/linien/server/iir_coeffs.py b/linien/linien-server/linien/server/iir_coeffs.py
similarity index 100%
rename from linien/server/iir_coeffs.py
rename to linien/linien-server/linien/server/iir_coeffs.py
diff --git a/linien/server/linien.bin b/linien/linien-server/linien/server/linien.bin
similarity index 100%
rename from linien/server/linien.bin
rename to linien/linien-server/linien/server/linien.bin
diff --git a/linien/server/linien_install_requirements.sh b/linien/linien-server/linien/server/linien_install_requirements.sh
similarity index 100%
rename from linien/server/linien_install_requirements.sh
rename to linien/linien-server/linien/server/linien_install_requirements.sh
diff --git a/linien/server/linien_start_ethernet_blinking.sh b/linien/linien-server/linien/server/linien_start_ethernet_blinking.sh
similarity index 100%
rename from linien/server/linien_start_ethernet_blinking.sh
rename to linien/linien-server/linien/server/linien_start_ethernet_blinking.sh
diff --git a/linien/server/linien_start_server.sh b/linien/linien-server/linien/server/linien_start_server.sh
similarity index 100%
rename from linien/server/linien_start_server.sh
rename to linien/linien-server/linien/server/linien_start_server.sh
diff --git a/linien/server/linien_stop_ethernet_blinking.sh b/linien/linien-server/linien/server/linien_stop_ethernet_blinking.sh
similarity index 100%
rename from linien/server/linien_stop_ethernet_blinking.sh
rename to linien/linien-server/linien/server/linien_stop_ethernet_blinking.sh
diff --git a/linien/server/linien_stop_server.sh b/linien/linien-server/linien/server/linien_stop_server.sh
similarity index 100%
rename from linien/server/linien_stop_server.sh
rename to linien/linien-server/linien/server/linien_stop_server.sh
diff --git a/linien/server/optimization/__init__.py b/linien/linien-server/linien/server/optimization/__init__.py
similarity index 100%
rename from linien/server/optimization/__init__.py
rename to linien/linien-server/linien/server/optimization/__init__.py
diff --git a/linien/server/optimization/engine.py b/linien/linien-server/linien/server/optimization/engine.py
similarity index 100%
rename from linien/server/optimization/engine.py
rename to linien/linien-server/linien/server/optimization/engine.py
diff --git a/linien/server/optimization/general.py b/linien/linien-server/linien/server/optimization/general.py
similarity index 100%
rename from linien/server/optimization/general.py
rename to linien/linien-server/linien/server/optimization/general.py
diff --git a/linien/server/optimization/optimization.py b/linien/linien-server/linien/server/optimization/optimization.py
similarity index 100%
rename from linien/server/optimization/optimization.py
rename to linien/linien-server/linien/server/optimization/optimization.py
diff --git a/linien/server/optimization/utils.py b/linien/linien-server/linien/server/optimization/utils.py
similarity index 100%
rename from linien/server/optimization/utils.py
rename to linien/linien-server/linien/server/optimization/utils.py
diff --git a/linien/server/parameter_store.py b/linien/linien-server/linien/server/parameter_store.py
similarity index 100%
rename from linien/server/parameter_store.py
rename to linien/linien-server/linien/server/parameter_store.py
diff --git a/linien/server/parameters.py b/linien/linien-server/linien/server/parameters.py
similarity index 100%
rename from linien/server/parameters.py
rename to linien/linien-server/linien/server/parameters.py
diff --git a/linien/server/parameters_base.py b/linien/linien-server/linien/server/parameters_base.py
similarity index 100%
rename from linien/server/parameters_base.py
rename to linien/linien-server/linien/server/parameters_base.py
diff --git a/linien/server/pid_optimization/__init__.py b/linien/linien-server/linien/server/pid_optimization/__init__.py
similarity index 100%
rename from linien/server/pid_optimization/__init__.py
rename to linien/linien-server/linien/server/pid_optimization/__init__.py
diff --git a/linien/server/pid_optimization/pid_optimization.py b/linien/linien-server/linien/server/pid_optimization/pid_optimization.py
similarity index 100%
rename from linien/server/pid_optimization/pid_optimization.py
rename to linien/linien-server/linien/server/pid_optimization/pid_optimization.py
diff --git a/linien/server/registers.py b/linien/linien-server/linien/server/registers.py
similarity index 100%
rename from linien/server/registers.py
rename to linien/linien-server/linien/server/registers.py
diff --git a/linien/server/server.py b/linien/linien-server/linien/server/server.py
similarity index 100%
rename from linien/server/server.py
rename to linien/linien-server/linien/server/server.py
diff --git a/linien/server/utils.py b/linien/linien-server/linien/server/utils.py
similarity index 100%
rename from linien/server/utils.py
rename to linien/linien-server/linien/server/utils.py
diff --git a/requirements_server.txt b/linien/linien-server/requirements.txt
similarity index 100%
rename from requirements_server.txt
rename to linien/linien-server/requirements.txt
diff --git a/setup_server.py b/linien/linien-server/setup.py
similarity index 100%
rename from setup_server.py
rename to linien/linien-server/setup.py
diff --git a/scripts/upload_pypi.sh b/linien/upload_pypi.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/upload_pypi.sh
rename to linien/upload_pypi.sh
diff --git a/requirements_dev.txt b/requirements.txt
similarity index 100%
rename from requirements_dev.txt
rename to requirements.txt