diff --git a/CAD/.DS_Store b/CAD/.DS_Store
new file mode 100644
index 0000000..527c640
Binary files /dev/null and b/CAD/.DS_Store differ
diff --git a/CAD/Display3D_Druck.FCStd b/CAD/CAD/Display3D_Druck.FCStd
similarity index 100%
rename from CAD/Display3D_Druck.FCStd
rename to CAD/CAD/Display3D_Druck.FCStd
diff --git a/CAD/DisplayHolder.FCStd b/CAD/CAD/DisplayHolder.FCStd
similarity index 100%
rename from CAD/DisplayHolder.FCStd
rename to CAD/CAD/DisplayHolder.FCStd
diff --git a/CAD/Halter_3D.stl b/CAD/CAD/Halter_3D.stl
similarity index 100%
rename from CAD/Halter_3D.stl
rename to CAD/CAD/Halter_3D.stl
diff --git a/CAD/NWS_WMA_001_Feststellungsplate.pdf b/CAD/CAD/NWS_WMA_001_Feststellungsplate.pdf
similarity index 100%
rename from CAD/NWS_WMA_001_Feststellungsplate.pdf
rename to CAD/CAD/NWS_WMA_001_Feststellungsplate.pdf
diff --git a/CAD/NWS_WMA_002_Bottom_Plate.pdf b/CAD/CAD/NWS_WMA_002_Bottom_Plate.pdf
similarity index 100%
rename from CAD/NWS_WMA_002_Bottom_Plate.pdf
rename to CAD/CAD/NWS_WMA_002_Bottom_Plate.pdf
diff --git a/CAD/NWS_WMA_003_Back_Plate.pdf b/CAD/CAD/NWS_WMA_003_Back_Plate.pdf
similarity index 100%
rename from CAD/NWS_WMA_003_Back_Plate.pdf
rename to CAD/CAD/NWS_WMA_003_Back_Plate.pdf
diff --git a/CAD/NWS_WMA_004_Mounting_View.pdf b/CAD/CAD/NWS_WMA_004_Mounting_View.pdf
similarity index 100%
rename from CAD/NWS_WMA_004_Mounting_View.pdf
rename to CAD/CAD/NWS_WMA_004_Mounting_View.pdf
diff --git a/CAD/NWS_WMA_005_Complete_View.pdf b/CAD/CAD/NWS_WMA_005_Complete_View.pdf
similarity index 100%
rename from CAD/NWS_WMA_005_Complete_View.pdf
rename to CAD/CAD/NWS_WMA_005_Complete_View.pdf
diff --git a/Dokumentation/.DS_Store b/Dokumentation/.DS_Store
new file mode 100644
index 0000000..c2f2672
Binary files /dev/null and b/Dokumentation/.DS_Store differ
diff --git a/Angebot/Angebot Recdata.pdf b/Dokumentation/Angebot/Angebot Recdata.pdf
similarity index 100%
rename from Angebot/Angebot Recdata.pdf
rename to Dokumentation/Angebot/Angebot Recdata.pdf
diff --git a/Angebot/V1.2_Windmessanlage.pdf b/Dokumentation/Angebot/V1.2_Windmessanlage.pdf
similarity index 100%
rename from Angebot/V1.2_Windmessanlage.pdf
rename to Dokumentation/Angebot/V1.2_Windmessanlage.pdf
diff --git a/Angebot/Windmessanlage.docx b/Dokumentation/Angebot/Windmessanlage.docx
similarity index 100%
rename from Angebot/Windmessanlage.docx
rename to Dokumentation/Angebot/Windmessanlage.docx
diff --git a/Angebot/Windmessanlage.pdf b/Dokumentation/Angebot/Windmessanlage.pdf
similarity index 100%
rename from Angebot/Windmessanlage.pdf
rename to Dokumentation/Angebot/Windmessanlage.pdf
diff --git a/Dokumentation/4.920x.00.000_ClimaSensor_US_V4.15_d.pdf b/Dokumentation/Dokumentation/4.920x.00.000_ClimaSensor_US_V4.15_d.pdf
similarity index 100%
rename from Dokumentation/4.920x.00.000_ClimaSensor_US_V4.15_d.pdf
rename to Dokumentation/Dokumentation/4.920x.00.000_ClimaSensor_US_V4.15_d.pdf
diff --git a/Dokumentation/HSE.pdf b/Dokumentation/Dokumentation/HSE.pdf
similarity index 100%
rename from Dokumentation/HSE.pdf
rename to Dokumentation/Dokumentation/HSE.pdf
diff --git a/Dokumentation/cpi-a070wr_en_02__34742.1498799123.1280.1280.png b/Dokumentation/Dokumentation/cpi-a070wr_en_02__34742.1498799123.1280.1280.png
similarity index 100%
rename from Dokumentation/cpi-a070wr_en_02__34742.1498799123.1280.1280.png
rename to Dokumentation/Dokumentation/cpi-a070wr_en_02__34742.1498799123.1280.1280.png
diff --git a/Dokumentation/thiesclima_Wind-Clima-Sensor-US_09-04-2020.pdf b/Dokumentation/Dokumentation/thiesclima_Wind-Clima-Sensor-US_09-04-2020.pdf
similarity index 100%
rename from Dokumentation/thiesclima_Wind-Clima-Sensor-US_09-04-2020.pdf
rename to Dokumentation/Dokumentation/thiesclima_Wind-Clima-Sensor-US_09-04-2020.pdf
diff --git a/Projektplanung/2020-04-02_Projektplanung.xlsx b/Dokumentation/Projektplanung/2020-04-02_Projektplanung.xlsx
similarity index 100%
rename from Projektplanung/2020-04-02_Projektplanung.xlsx
rename to Dokumentation/Projektplanung/2020-04-02_Projektplanung.xlsx
diff --git a/Projektplanung/Projektplanung.xlsx b/Dokumentation/Projektplanung/Projektplanung.xlsx
similarity index 100%
rename from Projektplanung/Projektplanung.xlsx
rename to Dokumentation/Projektplanung/Projektplanung.xlsx
diff --git a/Software/.DS_Store b/Software/.DS_Store
new file mode 100644
index 0000000..1c13b40
Binary files /dev/null and b/Software/.DS_Store differ
diff --git a/Software/Software/Display b/Software/Software/Display
deleted file mode 160000
index 1bef531..0000000
--- a/Software/Software/Display
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1bef531c22f24741f22ebdd14f54375706acd3bb
diff --git a/Software/Software/Sensor b/Software/Software/Sensor
deleted file mode 160000
index fd94fd7..0000000
--- a/Software/Software/Sensor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd94fd7377ddd09f092ef974bcfe693c35198dfc
diff --git a/Software/Software/tig-stack b/Software/Software/tig-stack
deleted file mode 160000
index dd77345..0000000
--- a/Software/Software/tig-stack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dd773459da6ff296c5e8f849c6ac48848a6b234f
diff --git a/readme.md b/Software/readme.md
similarity index 100%
rename from readme.md
rename to Software/readme.md
diff --git a/Worktree b/Worktree
deleted file mode 160000
index d940de8..0000000
--- a/Worktree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d940de8caa68d6364d0a810c285e9578c7a1f13c