diff --git a/02/src/de/dis2011/FormUtil.java b/02/src/de/dis2017/FormUtil.java
similarity index 98%
rename from 02/src/de/dis2011/FormUtil.java
rename to 02/src/de/dis2017/FormUtil.java
index 7cfa5e3..badc886 100644
--- a/02/src/de/dis2011/FormUtil.java
+++ b/02/src/de/dis2017/FormUtil.java
@@ -1,4 +1,4 @@
-package de.dis2011;
+package de.dis2017;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/02/src/de/dis2011/Main.java b/02/src/de/dis2017/Main.java
similarity index 96%
rename from 02/src/de/dis2011/Main.java
rename to 02/src/de/dis2017/Main.java
index fc663aa..e3b7539 100644
--- a/02/src/de/dis2011/Main.java
+++ b/02/src/de/dis2017/Main.java
@@ -1,6 +1,6 @@
-package de.dis2011;
+package de.dis2017;
 
-import de.dis2011.data.Makler;
+import de.dis2017.data.Makler;
 
 /**
  * Hauptklasse
diff --git a/02/src/de/dis2011/Menu.java b/02/src/de/dis2017/Menu.java
similarity index 99%
rename from 02/src/de/dis2011/Menu.java
rename to 02/src/de/dis2017/Menu.java
index 2e9117a..14421cc 100644
--- a/02/src/de/dis2011/Menu.java
+++ b/02/src/de/dis2017/Menu.java
@@ -1,4 +1,4 @@
-package de.dis2011;
+package de.dis2017;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/02/src/de/dis2011/data/DB2ConnectionManager.java b/02/src/de/dis2017/data/DB2ConnectionManager.java
similarity index 92%
rename from 02/src/de/dis2011/data/DB2ConnectionManager.java
rename to 02/src/de/dis2017/data/DB2ConnectionManager.java
index b13ae93..c699367 100644
--- a/02/src/de/dis2011/data/DB2ConnectionManager.java
+++ b/02/src/de/dis2017/data/DB2ConnectionManager.java
@@ -1,75 +1,74 @@
-package de.dis2011.data;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-
-/**
- * Einfaches Singleton zur Verwaltung von Datenbank-Verbindungen.
- * 
- * @author Michael von Riegen
- * @version April 2009
- */
-class DB2ConnectionManager {
-
-	// instance of Driver Manager
-	private static DB2ConnectionManager _instance = null;
-
-	// DB2 connection
-	private Connection _con;
-
-	/**
-	 * Erzeugt eine Datenbank-Verbindung
-	 */
-	private DB2ConnectionManager() {
-		try {
-			// Holen der Einstellungen aus der db2.properties Datei
-			Properties properties = new Properties();
-			URL url = ClassLoader.getSystemResource("db2.properties");
-			FileInputStream stream = new FileInputStream(new File(url.toURI()));
-			properties.load(stream);
-			stream.close();
-
-			String jdbcUser = properties.getProperty("jdbc_user");
-			String jdbcPass = properties.getProperty("jdbc_pass");
-			String jdbcUrl = properties.getProperty("jdbc_url");
-
-			// Verbindung zur DB2 herstellen
-			Class.forName("com.ibm.db2.jcc.DB2Driver");
-			_con = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPass);
-
-		} catch (IOException | ClassNotFoundException | SQLException | URISyntaxException e){
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Liefert Instanz des Managers
-	 * 
-	 * @return DB2ConnectionManager
-	 */
-	static DB2ConnectionManager getInstance() {
-		if (_instance == null) {
-			_instance = new DB2ConnectionManager();
-		}
-		return _instance;
-	}
-
-	/**
-	 * Liefert eine Verbindung zur DB2 zurC<ck
-	 * 
-	 * @return Connection
-	 */
-	Connection getConnection() {
-		return _con;
-	}
-
+package de.dis2017.data;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+/**
+ * Einfaches Singleton zur Verwaltung von Datenbank-Verbindungen.
+ * 
+ * @author Michael von Riegen
+ * @version April 2009
+ */
+class DB2ConnectionManager {
+
+	// instance of Driver Manager
+	private static DB2ConnectionManager _instance = null;
+
+	// DB2 connection
+	private Connection _con;
+
+	/**
+	 * Erzeugt eine Datenbank-Verbindung
+	 */
+	private DB2ConnectionManager() {
+		try {
+			// Holen der Einstellungen aus der db2.properties Datei
+			Properties properties = new Properties();
+			URL url = ClassLoader.getSystemResource("db2.properties");
+			FileInputStream stream = new FileInputStream(new File(url.toURI()));
+			properties.load(stream);
+			stream.close();
+
+			String jdbcUser = properties.getProperty("jdbc_user");
+			String jdbcPass = properties.getProperty("jdbc_pass");
+			String jdbcUrl = properties.getProperty("jdbc_url");
+
+			// Verbindung zur DB2 herstellen
+			Class.forName("com.ibm.db2.jcc.DB2Driver");
+			_con = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPass);
+
+		} catch (IOException | ClassNotFoundException | SQLException | URISyntaxException e){
+			e.printStackTrace();
+		}
+
+	}
+
+	/**
+	 * Liefert Instanz des Managers
+	 * 
+	 * @return DB2ConnectionManager
+	 */
+	static DB2ConnectionManager getInstance() {
+		if (_instance == null) {
+			_instance = new DB2ConnectionManager();
+		}
+		return _instance;
+	}
+
+	/**
+	 * Liefert eine Verbindung zur DB2 zurC<ck
+	 * 
+	 * @return Connection
+	 */
+	Connection getConnection() {
+		return _con;
+	}
+
 }
\ No newline at end of file
diff --git a/02/src/de/dis2011/data/Makler.java b/02/src/de/dis2017/data/Makler.java
similarity index 98%
rename from 02/src/de/dis2011/data/Makler.java
rename to 02/src/de/dis2017/data/Makler.java
index 3ac7669..fa885da 100644
--- a/02/src/de/dis2011/data/Makler.java
+++ b/02/src/de/dis2017/data/Makler.java
@@ -1,4 +1,4 @@
-package de.dis2011.data;
+package de.dis2017.data;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -6,8 +6,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import de.dis2011.data.DB2ConnectionManager;
-
 /**
  * Makler-Bean
  *