diff --git a/examples/src/OpenDis7Examples/AllPduReceiver.java b/examples/src/OpenDis7Examples/AllPduReceiver.java
index 9bd118947235d22e287be4e60ea6317a24d9ef6e..fb1c292264e47bfc86478f41958fb0d0c8c65182 100644
--- a/examples/src/OpenDis7Examples/AllPduReceiver.java
+++ b/examples/src/OpenDis7Examples/AllPduReceiver.java
@@ -3,7 +3,7 @@ package OpenDis7Examples;
 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.PduFactory;
 import java.util.ArrayList;
diff --git a/examples/src/OpenDis7Examples/AllPduSender.java b/examples/src/OpenDis7Examples/AllPduSender.java
index 2e5120f22d09687f410e5c18ce90403c0894272b..5bd043d2272534d3963858604167bf136fff4d13 100755
--- a/examples/src/OpenDis7Examples/AllPduSender.java
+++ b/examples/src/OpenDis7Examples/AllPduSender.java
@@ -4,7 +4,7 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
diff --git a/examples/src/OpenDis7Examples/EspduReceiver.java b/examples/src/OpenDis7Examples/EspduReceiver.java
index f99b0f03556be9aadacaf281edad7ae367bc1837..560adf8d65f28a8430f2023201033a6a7415a082 100755
--- a/examples/src/OpenDis7Examples/EspduReceiver.java
+++ b/examples/src/OpenDis7Examples/EspduReceiver.java
@@ -4,7 +4,7 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.utilities.*;
 
 /**
diff --git a/examples/src/OpenDis7Examples/EspduSender.java b/examples/src/OpenDis7Examples/EspduSender.java
index 0c81c79733a6ca423c5d93f82b4d7e8496a6847b..a5e9e200ea8a2f9e2bf4362c17c9e54c306b20f2 100644
--- a/examples/src/OpenDis7Examples/EspduSender.java
+++ b/examples/src/OpenDis7Examples/EspduSender.java
@@ -4,7 +4,7 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.Country;
 import edu.nps.moves.dis7.enumerations.EntityKind;
 import edu.nps.moves.dis7.enumerations.PlatformDomain;
diff --git a/lib/open-dis7-classes.jar b/lib/open-dis7-classes.jar
deleted file mode 100644
index bf4990b5d476301bafde4fd61c1748a395f3de2c..0000000000000000000000000000000000000000
Binary files a/lib/open-dis7-classes.jar and /dev/null differ
diff --git a/lib/open-dis7-enumerations-classes.jar b/lib/open-dis7-enumerations-classes.jar
index 2770da25eee3a9b608dece723ea8f313f4441548..db2e49ea2ffe2751550758e0ad7ebacfd3575e7a 100644
Binary files a/lib/open-dis7-enumerations-classes.jar and b/lib/open-dis7-enumerations-classes.jar differ
diff --git a/lib/open-dis7-enumerations-javadoc.jar b/lib/open-dis7-enumerations-javadoc.jar
index 9ed6b321e9114a2425b5a2629959f62cef5981f4..ef579dc7409aa59e3b5f50b6cf03a0c385a85875 100644
Binary files a/lib/open-dis7-enumerations-javadoc.jar and b/lib/open-dis7-enumerations-javadoc.jar differ
diff --git a/lib/open-dis7-enumerations-source.jar b/lib/open-dis7-enumerations-source.jar
index 873c7b32e540e66cdad558a1aa1362c46be2ac9d..13e181357eadec070dfc114dc88e8c6ba17ad710 100644
Binary files a/lib/open-dis7-enumerations-source.jar and b/lib/open-dis7-enumerations-source.jar differ
diff --git a/lib/open-dis7-javadoc.jar b/lib/open-dis7-javadoc.jar
deleted file mode 100644
index 329df8001c42c9f078cbaaa3ca26ef0962953748..0000000000000000000000000000000000000000
Binary files a/lib/open-dis7-javadoc.jar and /dev/null differ
diff --git a/lib/open-dis7-source.jar b/lib/open-dis7-source.jar
deleted file mode 100644
index 8d68db2815c80ac4b318adfb7d32d2c83f651192..0000000000000000000000000000000000000000
Binary files a/lib/open-dis7-source.jar and /dev/null differ