diff --git a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/Driver.java b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/Driver.java
index e497dfa0f0a398c21f0d35a9b3ac6149ce664203..3ff6b7e0dc541825853f3835c53240d45450e827 100644
--- a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/Driver.java
+++ b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/Driver.java
@@ -15,9 +15,10 @@ public class Driver {
       try {
          final RdbmsHandler dbHandler = new RdbmsHandler();
          dbHandler.connect();
-         final Parser parser = new Parser(dbHandler, "Testdata/group", "Testdata/passwd");
+         final Parser parser = new Parser(dbHandler, "Testdata/group",
+               "Testdata/passwd");
          parser.insertData();
-         
+
       } catch (ParseError e) {
          System.err.println(e.getMessage());
          System.exit(1);
@@ -26,5 +27,4 @@ public class Driver {
          System.exit(1);
       }
    }
-   
 }
diff --git a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java
index 887b028e1e6592c4d9636468c02ac515904fd5de..49b1dcf02266bab3772b342be062297d2a640c01 100644
--- a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java
+++ b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Group.java
@@ -13,7 +13,8 @@ public class Group {
          .getLogger(Group.class);
    
    public static final Map<String, Set<Group>> secondaryGroupsByUid = new HashMap<String, Set<Group>>();
-   public static final Set<Group> groups = new HashSet<Group>();
+   
+   public static final Map<Integer, Group> groups = new HashMap<Integer, Group>();
    
    public Group(final String groupLine, int row) 
     throws ParseError {
@@ -49,7 +50,7 @@ public class Group {
             secondaryGroups.add(this);
          }
       }
-      groups.add(this);
+      groups.put(gidNumber, this);
    }
    public final String gid;
    public final int gidNumber;
diff --git a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Parser.java b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Parser.java
index 4d57a6639c1d1d5fecb111f4feabff86648093ae..68874aeac899dc15730db0f16e3e3ae552eee2fd 100644
--- a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Parser.java
+++ b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/parse/Parser.java
@@ -26,13 +26,13 @@ public class Parser {
             new Group(line, lineNo++);
          }
       } catch (IOException e) {
-         throw new ParseError("Unable to read from file '" +
-               groupFile+ "'");
+         throw new ParseError("Unable to parse '" +
+               groupFile+ "' file");
       }
    }
  
    public void insertData() {
-      rdbmsHandler.addGroups(Group.groups);
+      rdbmsHandler.addGroups(Group.groups.values());
    }
    
    BufferedReader openFile (final String filename) 
diff --git a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java
index 591c90da6f5e619aa42b80475584d7b8c0bf58af..bc072e0b6584c6ae7ba64eccbf066c21b9340766 100644
--- a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java
+++ b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/rdbms/RdbmsHandler.java
@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Collection;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
@@ -46,7 +47,7 @@ public class RdbmsHandler {
       insertGroupStmt = conn.prepareStatement(insertGroupSql, Statement.RETURN_GENERATED_KEYS);
    }
 
-   public void addGroups(final Set<Group> groups) {
+   public void addGroups(final Collection<Group> groups) {
       try {
          for (final Group g : groups) {
             insertGroupStmt.setString(1, g.gid);
diff --git a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/jdbc.properties b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/resources/de/hdm_stuttgart/mi/sda2/usermanage/jdbc.properties
similarity index 100%
rename from Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/de/hdm_stuttgart/mi/sda2/usermanage/jdbc.properties
rename to Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/resources/de/hdm_stuttgart/mi/sda2/usermanage/jdbc.properties
diff --git a/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/log4j.properties b/Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/resources/log4j.properties
similarity index 100%
rename from Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/java/log4j.properties
rename to Sda2/P/UnixSqlLdap/Jndi/usermanage/src/main/resources/log4j.properties