diff --git a/banking & finanzcontrolling/Banking und Finanzcontrolling SS13.tex b/Banking & Finanzcontrolling/SS13 Banking & Finanzcontrolling.tex
similarity index 100%
rename from banking & finanzcontrolling/Banking und Finanzcontrolling SS13.tex
rename to Banking & Finanzcontrolling/SS13 Banking & Finanzcontrolling.tex
diff --git a/buchfuehrung/WS1112-buchfuehrung.tex b/Buchführung/WS1112 Buchführung.tex
similarity index 100%
rename from buchfuehrung/WS1112-buchfuehrung.tex
rename to Buchführung/WS1112 Buchführung.tex
diff --git a/buchfuehrung/WS1213-buchführung.tex b/Buchführung/WS1213 Buchführung.tex
similarity index 100%
rename from buchfuehrung/WS1213-buchführung.tex
rename to Buchführung/WS1213 Buchführung.tex
diff --git a/evwl/WS1112-evwl.tex b/Einführung in die VWL/WS1112 EVWL.tex
similarity index 100%
rename from evwl/WS1112-evwl.tex
rename to Einführung in die VWL/WS1112 EVWL.tex
diff --git a/mathefuerinf1/WS1112-MfI1.tex b/GdI-MfI-1 Mathematik für Informatiker 1/WS1112 MfI1.tex
similarity index 100%
rename from mathefuerinf1/WS1112-MfI1.tex
rename to GdI-MfI-1 Mathematik für Informatiker 1/WS1112 MfI1.tex
diff --git a/mathefuerinf1/WS1213-MfI1.tex b/GdI-MfI-1 Mathematik für Informatiker 1/WS1213 MfI1.tex
similarity index 100%
rename from mathefuerinf1/WS1213-MfI1.tex
rename to GdI-MfI-1 Mathematik für Informatiker 1/WS1213 MfI1.tex
diff --git a/mathefuerinf1/fitch_selinger.sty b/GdI-MfI-1 Mathematik für Informatiker 1/fitch_selinger.sty
similarity index 100%
rename from mathefuerinf1/fitch_selinger.sty
rename to GdI-MfI-1 Mathematik für Informatiker 1/fitch_selinger.sty
diff --git a/nichtprozedurale_programmierung/WS1112-NPP.tex b/GdI-NPP-B/WS1112 NPP.tex
similarity index 100%
rename from nichtprozedurale_programmierung/WS1112-NPP.tex
rename to GdI-NPP-B/WS1112 NPP.tex
diff --git a/logik_sav/Logik-Klausur_SS15_Graph_2a.jpg b/GdI-SaV-B Logik/Logik-Klausur_SS15_Graph_2a.jpg
similarity index 100%
rename from logik_sav/Logik-Klausur_SS15_Graph_2a.jpg
rename to GdI-SaV-B Logik/Logik-Klausur_SS15_Graph_2a.jpg
diff --git a/logik_sav/Logik-Klausur_SS15.tex b/GdI-SaV-B Logik/SS15 Logik.tex
similarity index 100%
rename from logik_sav/Logik-Klausur_SS15.tex
rename to GdI-SaV-B Logik/SS15 Logik.tex
diff --git a/innovationsmanagement/SS13-Innovationsmgmt.tex b/Grundlagen des Innovationsmanagements/SS13-Innovationsmgmt.tex
similarity index 100%
rename from innovationsmanagement/SS13-Innovationsmgmt.tex
rename to Grundlagen des Innovationsmanagements/SS13-Innovationsmgmt.tex
diff --git a/innovationsmanagement/WS1112-Innovationsmgmt.tex b/Grundlagen des Innovationsmanagements/WS1112-Innovationsmgmt.tex
similarity index 100%
rename from innovationsmanagement/WS1112-Innovationsmgmt.tex
rename to Grundlagen des Innovationsmanagements/WS1112-Innovationsmgmt.tex
diff --git a/innovationsmanagement/WS1415-Innovationsmgmt.tex b/Grundlagen des Innovationsmanagements/WS1415-Innovationsmgmt.tex
similarity index 100%
rename from innovationsmanagement/WS1415-Innovationsmgmt.tex
rename to Grundlagen des Innovationsmanagements/WS1415-Innovationsmgmt.tex
diff --git a/innovationsmanagement/WS1516-Innovationsmgmt.tex b/Grundlagen des Innovationsmanagements/WS1516-Innovationsmgmt.tex
similarity index 100%
rename from innovationsmanagement/WS1516-Innovationsmgmt.tex
rename to Grundlagen des Innovationsmanagements/WS1516-Innovationsmgmt.tex
diff --git a/interaktive_systeme/WS1112-IS.tex b/HCI-IS-B Interaktive Systeme/WS1112 HCI-IS.tex
similarity index 100%
rename from interaktive_systeme/WS1112-IS.tex
rename to HCI-IS-B Interaktive Systeme/WS1112 HCI-IS.tex
diff --git a/electronicbusiness/ebiz.tex b/IIS-E-Biz-B Electronic Business/WS1314 EBiz.tex
similarity index 100%
rename from electronicbusiness/ebiz.tex
rename to IIS-E-Biz-B Electronic Business/WS1314 EBiz.tex
diff --git a/analyse_sozialer_netzwerke/fs-logo.png b/IIS-E-Biz-B Electronic Business/fs-logo.png
similarity index 100%
rename from analyse_sozialer_netzwerke/fs-logo.png
rename to IIS-E-Biz-B Electronic Business/fs-logo.png
diff --git a/electronicbusiness/klausuren-Settings-utf8.tex b/IIS-E-Biz-B Electronic Business/klausuren-Settings-utf8.tex
similarity index 100%
rename from electronicbusiness/klausuren-Settings-utf8.tex
rename to IIS-E-Biz-B Electronic Business/klausuren-Settings-utf8.tex
diff --git a/intercultural_management/InterculturalManagementSS15.tex b/ISDL-ICM-B Intercultural Management/SS15 InterculturalManagement.tex
similarity index 100%
rename from intercultural_management/InterculturalManagementSS15.tex
rename to ISDL-ICM-B Intercultural Management/SS15 InterculturalManagement.tex
diff --git a/standards_und_netzwerke/ws1516-isdl1.tex b/ISDL-ISS1-M Standards und Netzwerke/WS1516 ISDL1.tex
similarity index 100%
rename from standards_und_netzwerke/ws1516-isdl1.tex
rename to ISDL-ISS1-M Standards und Netzwerke/WS1516 ISDL1.tex
diff --git a/SOA-Governance and Evaluation/SOA-Governance and Evaluation_SoSe12.tex b/ISDL-SOA Governance and Evaluation/SS12 SOA-Governance and Evaluation.tex
similarity index 100%
rename from SOA-Governance and Evaluation/SOA-Governance and Evaluation_SoSe12.tex
rename to ISDL-SOA Governance and Evaluation/SS12 SOA-Governance and Evaluation.tex
diff --git a/wawi/Wissenschaftliches_Arbeiten_in_der_WI_SS2015.tex b/ISDL-WAWI-B Wissenschaftliches Arbeiten in der WI/SS15 Wissenschaftliches_Arbeiten_in_der_WI.tex
similarity index 100%
rename from wawi/Wissenschaftliches_Arbeiten_in_der_WI_SS2015.tex
rename to ISDL-WAWI-B Wissenschaftliches Arbeiten in der WI/SS15 Wissenschaftliches_Arbeiten_in_der_WI.tex
diff --git a/wawi/Wissenschaftliches_Arbeiten_in_der_WI_SoSe_2016.tex b/ISDL-WAWI-B Wissenschaftliches Arbeiten in der WI/SS16 Wissenschaftliches_Arbeiten_in_der_WI.tex
similarity index 100%
rename from wawi/Wissenschaftliches_Arbeiten_in_der_WI_SoSe_2016.tex
rename to ISDL-WAWI-B Wissenschaftliches Arbeiten in der WI/SS16 Wissenschaftliches_Arbeiten_in_der_WI.tex
diff --git a/wawi/Wissenschaftliches_Arbeiten_in_der_WI_WS_1516.tex b/ISDL-WAWI-B Wissenschaftliches Arbeiten in der WI/WS1516 Wissenschaftliches_Arbeiten_in_der_WI.tex
similarity index 100%
rename from wawi/Wissenschaftliches_Arbeiten_in_der_WI_WS_1516.tex
rename to ISDL-WAWI-B Wissenschaftliches Arbeiten in der WI/WS1516 Wissenschaftliches_Arbeiten_in_der_WI.tex
diff --git a/it_english_1/it_english_1_ws1415.tex b/IT English 1/WS1415 IT English 1.tex
similarity index 100%
rename from it_english_1/it_english_1_ws1415.tex
rename to IT English 1/WS1415 IT English 1.tex
diff --git a/Internationales IT-Projektmanagement/Internationales_IT-Projektmanagement_SoSe_2016.tex b/Internationales IT-Projektmanagement/SS16 Internationales IT-Projektmanagement.tex
similarity index 100%
rename from Internationales IT-Projektmanagement/Internationales_IT-Projektmanagement_SoSe_2016.tex
rename to Internationales IT-Projektmanagement/SS16 Internationales IT-Projektmanagement.tex
diff --git a/SemInf/ws1516-SemInf.tex b/KInf-SemInf-M/WS1516-SemInf.tex
similarity index 100%
rename from SemInf/ws1516-SemInf.tex
rename to KInf-SemInf-M/WS1516-SemInf.tex
diff --git a/SemInf/ws1516-SemInf-problem2a.jpg b/KInf-SemInf-M/ws1516-SemInf-problem2a.jpg
similarity index 100%
rename from SemInf/ws1516-SemInf-problem2a.jpg
rename to KInf-SemInf-M/ws1516-SemInf-problem2a.jpg
diff --git a/SemInf/ws1516-SemInf-problem2c.jpg b/KInf-SemInf-M/ws1516-SemInf-problem2c.jpg
similarity index 100%
rename from SemInf/ws1516-SemInf-problem2c.jpg
rename to KInf-SemInf-M/ws1516-SemInf-problem2c.jpg
diff --git a/SemInf/ws1516-SemInf-problem3a.jpg b/KInf-SemInf-M/ws1516-SemInf-problem3a.jpg
similarity index 100%
rename from SemInf/ws1516-SemInf-problem3a.jpg
rename to KInf-SemInf-M/ws1516-SemInf-problem3a.jpg
diff --git a/datenkommunikation/Capture.PNG b/KTR-Datkomm-B Datenkommunikation/Capture.PNG
similarity index 100%
rename from datenkommunikation/Capture.PNG
rename to KTR-Datkomm-B Datenkommunikation/Capture.PNG
diff --git a/datenkommunikation/Capture2.PNG b/KTR-Datkomm-B Datenkommunikation/Capture2.PNG
similarity index 100%
rename from datenkommunikation/Capture2.PNG
rename to KTR-Datkomm-B Datenkommunikation/Capture2.PNG
diff --git a/datenkommunikation/Capture3.PNG b/KTR-Datkomm-B Datenkommunikation/Capture3.PNG
similarity index 100%
rename from datenkommunikation/Capture3.PNG
rename to KTR-Datkomm-B Datenkommunikation/Capture3.PNG
diff --git a/datenkommunikation/Capture4.PNG b/KTR-Datkomm-B Datenkommunikation/Capture4.PNG
similarity index 100%
rename from datenkommunikation/Capture4.PNG
rename to KTR-Datkomm-B Datenkommunikation/Capture4.PNG
diff --git a/datenkommunikation/WS1112-Datkom.tex b/KTR-Datkomm-B Datenkommunikation/WS1112 Datkomm.tex
similarity index 100%
rename from datenkommunikation/WS1112-Datkom.tex
rename to KTR-Datkomm-B Datenkommunikation/WS1112 Datkomm.tex
diff --git a/datenkommunikation/datkom1314.tex b/KTR-Datkomm-B Datenkommunikation/WS1314 Datkomm.tex
similarity index 100%
rename from datenkommunikation/datkom1314.tex
rename to KTR-Datkomm-B Datenkommunikation/WS1314 Datkomm.tex
diff --git a/mathefuerinf2/mfi2-13.tex b/KTR-MfI-2-B Mathematik für Informatiker 2/SS13 MfI2.tex
similarity index 100%
rename from mathefuerinf2/mfi2-13.tex
rename to KTR-MfI-2-B Mathematik für Informatiker 2/SS13 MfI2.tex
diff --git a/Legal and Compliance Requirements for IT/LegalAndComplianceSS15.tex b/Legal and Compliance Requirements for IT/SS15 LegalAndCompliance.tex
similarity index 100%
rename from Legal and Compliance Requirements for IT/LegalAndComplianceSS15.tex
rename to Legal and Compliance Requirements for IT/SS15 LegalAndCompliance.tex
diff --git a/Legal and Compliance Requirements for IT/Legal and Compliance Requirements for IT.tex b/Legal and Compliance Requirements for IT/WS13:14 Legal and Compliance Requirements for IT.tex
similarity index 100%
rename from Legal and Compliance Requirements for IT/Legal and Compliance Requirements for IT.tex
rename to Legal and Compliance Requirements for IT/WS13:14 Legal and Compliance Requirements for IT.tex
diff --git a/Management externer IT-Dienstleister/Management_externer_IT-Dienstleister_SS2015.tex b/Management externer IT-Dienstleister/SS15 Management_externer_IT-Dienstleister.tex
similarity index 100%
rename from Management externer IT-Dienstleister/Management_externer_IT-Dienstleister_SS2015.tex
rename to Management externer IT-Dienstleister/SS15 Management_externer_IT-Dienstleister.tex
diff --git a/analyse_sozialer_netzwerke/.gitignore b/SNA-ASN-M Analyse sozialer Netzwerke/.gitignore
similarity index 100%
rename from analyse_sozialer_netzwerke/.gitignore
rename to SNA-ASN-M Analyse sozialer Netzwerke/.gitignore
diff --git a/electronicbusiness/fs-logo.png b/SNA-ASN-M Analyse sozialer Netzwerke/fs-logo.png
similarity index 100%
rename from electronicbusiness/fs-logo.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/fs-logo.png
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung1.dot b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung1.dot
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung1.dot
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung1.dot
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung1.png b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung1.png
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung1.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung1.png
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung2.dot b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung2.dot
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung2.dot
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung2.dot
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung2.png b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung2.png
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung2.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung2.png
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung3.dot b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung3.dot
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung3.dot
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung3.dot
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung3.png b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung3.png
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung3.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung3.png
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung4.dot b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung4.dot
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung4.dot
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung4.dot
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung4.png b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung4.png
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung4.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung4.png
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung5.dot b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung5.dot
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung5.dot
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung5.dot
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung5.png b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung5.png
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung5.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung5.png
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung6.dot b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung6.dot
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung6.dot
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung6.dot
diff --git a/analyse_sozialer_netzwerke/graphs/abbildung6.png b/SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung6.png
similarity index 100%
rename from analyse_sozialer_netzwerke/graphs/abbildung6.png
rename to SNA-ASN-M Analyse sozialer Netzwerke/graphs/abbildung6.png
diff --git a/analyse_sozialer_netzwerke/klausuren-Settings-utf8.tex b/SNA-ASN-M Analyse sozialer Netzwerke/klausuren-Settings-utf8.tex
similarity index 100%
rename from analyse_sozialer_netzwerke/klausuren-Settings-utf8.tex
rename to SNA-ASN-M Analyse sozialer Netzwerke/klausuren-Settings-utf8.tex
diff --git a/analyse_sozialer_netzwerke/sna.tex b/SNA-ASN-M Analyse sozialer Netzwerke/sna.tex
similarity index 100%
rename from analyse_sozialer_netzwerke/sna.tex
rename to SNA-ASN-M Analyse sozialer Netzwerke/sna.tex
diff --git a/iwm/WS1112-iwm.tex b/SNA-IWM-B Informations und Wissensmanagement/WS1112 IWM.tex
similarity index 100%
rename from iwm/WS1112-iwm.tex
rename to SNA-IWM-B Informations und Wissensmanagement/WS1112 IWM.tex
diff --git a/software_engineering/SS14-fse.tex b/SWT-FSE-B Foundations of Software Engineering/SS14 FSE.tex
similarity index 100%
rename from software_engineering/SS14-fse.tex
rename to SWT-FSE-B Foundations of Software Engineering/SS14 FSE.tex
diff --git a/software_engineering/SS14-sei.tex b/SWT-FSE-B Foundations of Software Engineering/SS14 SEI.tex
similarity index 100%
rename from software_engineering/SS14-sei.tex
rename to SWT-FSE-B Foundations of Software Engineering/SS14 SEI.tex
diff --git a/software_engineering/WS1112-swe.tex b/SWT-FSE-B Foundations of Software Engineering/WS1112 SWE.tex
similarity index 100%
rename from software_engineering/WS1112-swe.tex
rename to SWT-FSE-B Foundations of Software Engineering/WS1112 SWE.tex
diff --git a/software_engineering/WS1314-swe.tex b/SWT-FSE-B Foundations of Software Engineering/WS1314 SWE.tex
similarity index 100%
rename from software_engineering/WS1314-swe.tex
rename to SWT-FSE-B Foundations of Software Engineering/WS1314 SWE.tex
diff --git a/intercultural_management/dummy.tex b/intercultural_management/dummy.tex
deleted file mode 100644
index e69de29..0000000