diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/.gitignore b/Klausuren/Sd1/SoSe2015/Exam/.gitignore
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/.gitignore
rename to Klausuren/Sd1/SoSe2015/Exam/.gitignore
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/pom.xml b/Klausuren/Sd1/SoSe2015/Exam/pom.xml
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/pom.xml
rename to Klausuren/Sd1/SoSe2015/Exam/pom.xml
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java b/Klausuren/Sd1/SoSe2015/Exam/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
rename to Klausuren/Sd1/SoSe2015/Exam/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/main/resources/log4j2.xml b/Klausuren/Sd1/SoSe2015/Exam/src/main/resources/log4j2.xml
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/src/main/resources/log4j2.xml
rename to Klausuren/Sd1/SoSe2015/Exam/src/main/resources/log4j2.xml
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java b/Klausuren/Sd1/SoSe2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java
rename to Klausuren/Sd1/SoSe2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/GetMarks.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java b/Klausuren/Sd1/SoSe2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
rename to Klausuren/Sd1/SoSe2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java b/Klausuren/Sd1/SoSe2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
rename to Klausuren/Sd1/SoSe2015/Exam/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/beschreibung.xhtml b/Klausuren/Sd1/SoSe2015/Solution/beschreibung.xhtml
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/beschreibung.xhtml
rename to Klausuren/Sd1/SoSe2015/Solution/beschreibung.xhtml
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml b/Klausuren/Sd1/SoSe2015/Solution/pom.xml
similarity index 56%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml
rename to Klausuren/Sd1/SoSe2015/Solution/pom.xml
index 6af04e848c397f955609939df6660308682f5ed8..5296239b735172e3bf848d37be79fb64b852a7f4 100644
--- a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/pom.xml
+++ b/Klausuren/Sd1/SoSe2015/Solution/pom.xml
@@ -24,54 +24,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
-
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>de.hdm_stuttgart.mi.bitte_ignorieren.eval.Run</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
- <executions>
-
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.basedir}/src/test/java/</source>
- </sources>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -85,7 +41,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
</dependency>
<dependency>
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/IllegalMorseCharacterException.java b/Klausuren/Sd1/SoSe2015/Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/IllegalMorseCharacterException.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/IllegalMorseCharacterException.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/IllegalMorseCharacterException.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java b/Klausuren/Sd1/SoSe2015/Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/main/java/de/hdm_stuttgart/sw1/klausur/StringTransforms.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/main/resources/log4j2.xml b/Klausuren/Sd1/SoSe2015/Solution/src/main/resources/log4j2.xml
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/main/resources/log4j2.xml
rename to Klausuren/Sd1/SoSe2015/Solution/src/main/resources/log4j2.xml
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/Marking.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/MarkingTest.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/ResultCollector.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/TestResult.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/DetailedTestResults.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/ReachedPoints.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/mi/bitte_ignorieren/eval/Run.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_MorseExceptions.java
diff --git a/Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java b/Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
similarity index 100%
rename from Klausuren/Sd1/SoSe2015/StringFunctions_Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java
rename to Klausuren/Sd1/SoSe2015/Solution/src/test/java/de/hdm_stuttgart/sw1/klausur/test/Test_StringTransforms.java