diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java
index 88b3e29bda4c83342d0022a74edd097bc74b1b64..95c656c68133d0aa58de0c8f6c92523070af6a8a 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java
@@ -5,7 +5,7 @@ import java.io.*;
 import java.net.*;
 
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -94,7 +94,7 @@ public class BRE_KNO_MCC_PC1_MCAST_PduSender
         for (int i = 0; i < numbOfPDUs; i++)
         {
             CommentPdu newCommentPdu = new CommentPdu();
-            ArrayList<VariableDatum> payloadList = new ArrayList<VariableDatum>();
+            ArrayList<VariableDatum> payloadList = new ArrayList<>();
 
             ArrayList<String> commentsList = new ArrayList<>();
             newCommentPdu.setTimestamp((intervall * 5) + i );
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java
index e1fe5cbfe32afa4a5aad588a49ac44a028daea7c..90e79875842cbdf435f748687ed8a3f5fd1af035 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java
@@ -1,6 +1,6 @@
 package MV3500Cohort2019JulySeptember.projects.BrennenstuhlKnobelochMcCann;
 
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
index ee513e773015a1e0e8bcfbbe129fc76715e950c2..e36e82cc707088545c70f4532f965cf2f88898f9 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
@@ -6,7 +6,7 @@ import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8
 import java.net.*;
 import java.io.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
 import edu.nps.moves.dis7.utilities.*;
 import java.util.ArrayList;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
index a0dffe5c75e42284e0b4bcf856d652b118b2d92d..5022ef29afda27a5ec7b9988c0ab51cabef7a743 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
@@ -13,6 +13,7 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver extends Thread
 
     static int portPC3;
 
+    @Override
     public void run()
     {
         isRunning = true;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
index 87bc5b00219ba0bd3f18d45ec0556c5576490cb8..c69ab2a5ba32595c9ee1c0042fd3a4437a7bcd74 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
@@ -5,7 +5,7 @@ import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8
 // maybe https://crunchify.com/what-is-java-semaphore-and-mutex-java-concurrency-multithread-explained-with-example/
 import java.util.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -27,6 +27,7 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread
     static InetAddress pc3IP;
     static int portPC3;
 
+    @Override
     public void run()
     {
         try
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
index de2f52bf8fd7472793f92314d95cc7e05434d448..7f17d59ebb9724a65938a1897231ce8ba829eb0d 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
@@ -3,8 +3,8 @@ package MV3500Cohort2019JulySeptember.projects.BrennenstuhlKnobelochMcCann;
 import java.net.*;
 import java.io.*;
 
-import edu.nps.moves.dis7.*;
-import edu.nps.moves.dis7.util.PduFactory;
+import edu.nps.moves.dis7.pdus.*;
+import edu.nps.moves.dis7.utilities.PduFactory;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;