diff --git a/build.all.out.txt b/build.all.out.txt
index 934cbe59c6e719f33bb7a2bf8380264618e0e4a5..155b145cee06b13177f6b52a710bf67582f3af37 100644
--- a/build.all.out.txt
+++ b/build.all.out.txt
@@ -1,15 +1,11 @@
 ant -f C:\\x3d-github\\open-dis7-java all
 all:
-timestamp 27 August 2020 21:39:24
+timestamp 30 August 2020 20:43:49
 clean:
-Deleting C:\x3d-github\open-dis7-java\dist\open-dis7-classes.jar
-Deleting C:\x3d-github\open-dis7-java\dist\open-dis7-javadoc.jar
-Deleting C:\x3d-github\open-dis7-java\dist\open-dis7-source.jar
-Deleting directory C:\x3d-github\open-dis7-java\javadoc
 ================
 compile:
 compile src, src-generated
-Compiling 21787 source files to C:\x3d-github\open-dis7-java\build\classes
+Compiling 21789 source files to C:\x3d-github\open-dis7-java\build\classes
 Note: C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\EntityTypeFactory.java uses unchecked or unsafe operations.
 Note: Recompile with -Xlint:unchecked for details.
 ================
@@ -20,89 +16,90 @@ compile src, src-generated
 Deleting: C:\x3d-github\open-dis7-java\build\built-jar.properties
 deps-jar:
 Updating property file: C:\x3d-github\open-dis7-java\build\built-jar.properties
-Deleted 20 out of date files in 0 seconds
-Compiling 14 source files to C:\x3d-github\open-dis7-java\build\test\classes
+Compiling 15 source files to C:\x3d-github\open-dis7-java\build\test\classes
 warning: [options] bootstrap class path not set in conjunction with -source 8
 1 warning
+Copying 1 file to C:\x3d-github\open-dis7-java\build\test\classes
 compile-test:
+Created dir: C:\x3d-github\open-dis7-java\build\test\results
 test:
 AllPduRoundTripTest
 Recorder log file open: C:\x3d-github\open-dis7-java\pduLog\PduCaptureLog.dislog
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] Using network interface Intel(R) Dual Band Wireless-AC 8260
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
 class edu.nps.moves.dis7.utilities.stream.PduRecorder listening to IP address 225.4.5.6 on port 3000
 Recorder log at C:\x3d-github\open-dis7-java\.\pduLog\PduCaptureLog.dislog
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 1. received DISPDUType 15 ACKNOWLEDGE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 2. received DISPDUType 55 ACKNOWLEDGE_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 3. received DISPDUType 16 ACTION_REQUEST
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 4. received DISPDUType 56 ACTION_REQUEST_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 5. received DISPDUType 17 ACTION_RESPONSE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 6. received DISPDUType 57 ACTION_RESPONSE_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 7. received DISPDUType 33 AGGREGATE_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 8. received DISPDUType 47 APPEARANCE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 9. received DISPDUType 45 AREAL_OBJECT_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 10. received DISPDUType 48 ARTICULATED_PARTS
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 11. received DISPDUType 72 ATTRIBUTE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 12. received DISPDUType 66 COLLISION_ELASTIC
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 13. received DISPDUType 4 COLLISION
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 14. received DISPDUType 22 COMMENT
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 15. received DISPDUType 62 COMMENT_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 16. received DISPDUType 11 CREATE_ENTITY
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 17. received DISPDUType 51 CREATE_ENTITY_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 18. received DISPDUType 20 DATA
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 19. received DISPDUType 18 DATA_QUERY
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 20. received DISPDUType 58 DATA_QUERY_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 21. received DISPDUType 60 DATA_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 22. received DISPDUType 24 DESIGNATOR
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 23. received DISPDUType 3 DETONATION
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 24. received DISPDUType 68 DIRECTED_ENERGY_FIRE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 25. received DISPDUType 23 ELECTROMAGNETIC_EMISSION
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 26. received DISPDUType 69 ENTITY_DAMAGE_STATUS
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 27. received DISPDUType 1 ENTITY_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 28. received DISPDUType 67 ENTITY_STATE_UPDATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 29. received DISPDUType 41 ENVIRONMENTAL_PROCESS
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 30. received DISPDUType 21 EVENT_REPORT
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 31. received DISPDUType 61 EVENT_REPORT_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 32. received DISPDUType 2 FIRE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 33. received DISPDUType 42 GRIDDED_DATA
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 34. received DISPDUType 28 IDENTIFICATION_FRIEND_OR_FOE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 35. received DISPDUType 71 INFORMATION_OPERATIONS_REPORT
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 36. received DISPDUType 70 INFORMATION_OPERATIONS_ACTION
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 37. received DISPDUType 32 INTERCOM_CONTROL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 38. received DISPDUType 31 INTERCOM_SIGNAL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 39. received DISPDUType 34 ISGROUPOF
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 40. received DISPDUType 36 ISPARTOF
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 41. received DISPDUType 50 LIVE_ENTITY_DETONATION
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 42. received DISPDUType 49 LIVE_ENTITY_FIRE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 43. received DISPDUType 44 LINEAR_OBJECT_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 44. received DISPDUType 39 MINEFIELD_DATA
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 45. received DISPDUType 38 MINEFIELD_QUERY
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 46. received DISPDUType 40 MINEFIELD_RESPONSE_NACK
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 47. received DISPDUType 37 MINEFIELD_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 48. received DISPDUType 43 POINT_OBJECT_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 49. received DISPDUType 27 RECEIVER
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 50. received DISPDUType 65 RECORD_QUERY_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 51. received DISPDUType 63 RECORD_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 52. received DISPDUType 12 REMOVE_ENTITY
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 53. received DISPDUType 52 REMOVE_ENTITY_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 54. received DISPDUType 9 REPAIR_COMPLETE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 55. received DISPDUType 10 REPAIR_RESPONSE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 56. received DISPDUType 8 RESUPPLY_CANCEL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 57. received DISPDUType 6 RESUPPLY_OFFER
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 58. received DISPDUType 7 RESUPPLY_RECEIVED
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 59. received DISPDUType 30 SUPPLEMENTAL_EMISSION_ENTITY_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 60. received DISPDUType 5 SERVICE_REQUEST
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 61. received DISPDUType 19 SET_DATA
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 62. received DISPDUType 59 SET_DATA_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 63. received DISPDUType 64 SET_RECORD_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 64. received DISPDUType 26 SIGNAL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 65. received DISPDUType 13 START_RESUME
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 66. received DISPDUType 53 START_RESUME_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 67. received DISPDUType 14 STOP_FREEZE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 68. received DISPDUType 54 STOP_FREEZE_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 69. received DISPDUType 35 TRANSFER_OWNERSHIP
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 70. received DISPDUType 25 TRANSMITTER
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 71. received DISPDUType 46 TIME_SPACE_POSITION_INFORMATION
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 72. received DISPDUType 29 UNDERWATER_ACOUSTIC
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 15 ACKNOWLEDGE (timestamp 05:15:37, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 55 ACKNOWLEDGE_RELIABLE (timestamp 05:15:38, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DISPDUType 16 ACTION_REQUEST (timestamp 05:15:38, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DISPDUType 56 ACTION_REQUEST_RELIABLE (timestamp 05:15:38, size 44 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. received DISPDUType 17 ACTION_RESPONSE (timestamp 05:15:40, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. received DISPDUType 57 ACTION_RESPONSE_RELIABLE (timestamp 05:15:40, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. received DISPDUType 33 AGGREGATE_STATE (timestamp 05:15:43, size 136 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. received DISPDUType 47 APPEARANCE (timestamp 05:15:48, size 69 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. received DISPDUType 45 AREAL_OBJECT_STATE (timestamp 05:15:50, size 49 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 10. received DISPDUType 48 ARTICULATED_PARTS (timestamp 05:15:50, size 19 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 11. received DISPDUType 72 ATTRIBUTE (timestamp 05:16:08, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 12. received DISPDUType 66 COLLISION_ELASTIC (timestamp 05:16:10, size 100 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 13. received DISPDUType 4 COLLISION (timestamp 05:16:11, size 60 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 14. received DISPDUType 22 COMMENT (timestamp 05:16:11, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 15. received DISPDUType 62 COMMENT_RELIABLE (timestamp 05:16:11, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 16. received DISPDUType 11 CREATE_ENTITY (timestamp 05:16:12, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 17. received DISPDUType 51 CREATE_ENTITY_RELIABLE (timestamp 05:16:12, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 18. received DISPDUType 20 DATA (timestamp 05:16:12, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 19. received DISPDUType 18 DATA_QUERY (timestamp 05:16:12, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 20. received DISPDUType 58 DATA_QUERY_RELIABLE (timestamp 05:16:12, size 44 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 21. received DISPDUType 60 DATA_RELIABLE (timestamp 05:16:13, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 22. received DISPDUType 24 DESIGNATOR (timestamp 05:16:13, size 88 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 23. received DISPDUType 3 DETONATION (timestamp 05:16:15, size 104 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 24. received DISPDUType 68 DIRECTED_ENERGY_FIRE (timestamp 05:16:17, size 88 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 25. received DISPDUType 23 ELECTROMAGNETIC_EMISSION (timestamp 05:16:18, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 26. received DISPDUType 69 ENTITY_DAMAGE_STATUS (timestamp 05:16:18, size 24 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 27. received DISPDUType 1 ENTITY_STATE (timestamp 05:16:19, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 28. received DISPDUType 67 ENTITY_STATE_UPDATE (timestamp 05:16:19, size 72 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 29. received DISPDUType 41 ENVIRONMENTAL_PROCESS (timestamp 05:16:20, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 30. received DISPDUType 21 EVENT_REPORT (timestamp 05:16:20, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 31. received DISPDUType 61 EVENT_REPORT_RELIABLE (timestamp 05:16:20, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 32. received DISPDUType 2 FIRE (timestamp 05:16:21, size 96 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 33. received DISPDUType 42 GRIDDED_DATA (timestamp 05:16:21, size 64 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 34. received DISPDUType 28 IDENTIFICATION_FRIEND_OR_FOE (timestamp 05:16:24, size 60 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 35. received DISPDUType 71 INFORMATION_OPERATIONS_REPORT (timestamp 05:16:25, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 36. received DISPDUType 70 INFORMATION_OPERATIONS_ACTION (timestamp 05:16:25, size 56 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 37. received DISPDUType 32 INTERCOM_CONTROL (timestamp 05:16:26, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 38. received DISPDUType 31 INTERCOM_SIGNAL (timestamp 05:16:27, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 39. received DISPDUType 34 ISGROUPOF (timestamp 05:16:27, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 40. received DISPDUType 36 ISPARTOF (timestamp 05:16:30, size 52 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 41. received DISPDUType 50 LIVE_ENTITY_DETONATION (timestamp 05:16:32, size 81 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 42. received DISPDUType 49 LIVE_ENTITY_FIRE (timestamp 05:16:32, size 69 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 43. received DISPDUType 44 LINEAR_OBJECT_STATE (timestamp 05:16:32, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 44. received DISPDUType 39 MINEFIELD_DATA (timestamp 05:16:35, size 44 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 45. received DISPDUType 38 MINEFIELD_QUERY (timestamp 05:16:35, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 46. received DISPDUType 40 MINEFIELD_RESPONSE_NACK (timestamp 05:16:36, size 26 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 47. received DISPDUType 37 MINEFIELD_STATE (timestamp 05:16:37, size 72 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 48. received DISPDUType 43 POINT_OBJECT_STATE (timestamp 05:16:39, size 91 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 49. received DISPDUType 27 RECEIVER (timestamp 05:16:39, size 36 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 50. received DISPDUType 65 RECORD_QUERY_RELIABLE (timestamp 05:16:41, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 51. received DISPDUType 63 RECORD_RELIABLE (timestamp 05:16:41, size 36 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 52. received DISPDUType 12 REMOVE_ENTITY (timestamp 05:16:41, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 53. received DISPDUType 52 REMOVE_ENTITY_RELIABLE (timestamp 05:16:41, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 54. received DISPDUType 9 REPAIR_COMPLETE (timestamp 05:16:41, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 55. received DISPDUType 10 REPAIR_RESPONSE (timestamp 05:16:42, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 56. received DISPDUType 8 RESUPPLY_CANCEL (timestamp 05:16:42, size 24 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 57. received DISPDUType 6 RESUPPLY_OFFER (timestamp 05:16:42, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 58. received DISPDUType 7 RESUPPLY_RECEIVED (timestamp 05:16:42, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 59. received DISPDUType 30 SUPPLEMENTAL_EMISSION_ENTITY_STATE (timestamp 05:16:42, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 60. received DISPDUType 5 SERVICE_REQUEST (timestamp 05:16:42, size 28 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 61. received DISPDUType 19 SET_DATA (timestamp 05:16:42, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 62. received DISPDUType 59 SET_DATA_RELIABLE (timestamp 05:16:43, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 63. received DISPDUType 64 SET_RECORD_RELIABLE (timestamp 05:16:43, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 64. received DISPDUType 26 SIGNAL (timestamp 05:16:43, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 65. received DISPDUType 13 START_RESUME (timestamp 05:16:43, size 44 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 66. received DISPDUType 53 START_RESUME_RELIABLE (timestamp 05:16:43, size 48 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 67. received DISPDUType 14 STOP_FREEZE (timestamp 05:16:44, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 68. received DISPDUType 54 STOP_FREEZE_RELIABLE (timestamp 05:16:44, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 69. received DISPDUType 35 TRANSFER_OWNERSHIP (timestamp 05:16:45, size 40 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 70. received DISPDUType 25 TRANSMITTER (timestamp 05:16:49, size 107 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 71. received DISPDUType 46 TIME_SPACE_POSITION_INFORMATION (timestamp 05:16:52, size 56 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 72. received DISPDUType 29 UNDERWATER_ACOUSTIC (timestamp 05:16:52, size 32 bytes)
 
 Closing recorder log file: C:\x3d-github\open-dis7-java\pduLog\PduCaptureLog.dislog
 pduReceivedMap.size()=72, pduSentMap.size()=72, match=true
@@ -112,9 +109,9 @@ ENCODING_PLAINTEXT
 Total PDUs: 72
 End of replay from PduCaptureLog.dislog
 BitFieldRoundTripTest
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] Using network interface Intel(R) Dual Band Wireless-AC 8260
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 73. received DISPDUType 1 ENTITY_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 1. received DISPDUType 1 ENTITY_STATE
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 73. received DISPDUType 1 ENTITY_STATE (timestamp 05:28:08, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 1 ENTITY_STATE (timestamp 05:28:08, size 144 bytes)
 Sent pdu: 
 Alternative EntityType: EntityType:
  entityKind: EntityKind 0 OTHER
@@ -183,7 +180,7 @@ Pdu Status: PduStatus: 00101000
 Pdu Type: DISPDUType 1 ENTITY_STATE
 Protocol Family: DISProtocolFamily 1 ENTITY_INFORMATION_INTERACTION
 Protocol Version: DISProtocolVersion 7 IEEE_12781_2012
-Timestamp: -1341715573
+Timestamp: -1074711773
 Variable Parameters: []
 
 Rcvd pdu: 
@@ -254,23 +251,27 @@ Pdu Status: PduStatus: 00101000
 Pdu Type: DISPDUType 1 ENTITY_STATE
 Protocol Family: DISProtocolFamily 1 ENTITY_INFORMATION_INTERACTION
 Protocol Version: DISProtocolVersion 7 IEEE_12781_2012
-Timestamp: -1341715573
+Timestamp: -1074711773
 Variable Parameters: []
 
 EntityStatePduTest
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 1 ENTITY_STATE (timestamp 05:31:58, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 1 ENTITY_STATE (timestamp 05:31:58, size 144 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 1 ENTITY_STATE (timestamp 05:31:58, size 144 bytes)
 CreateAllPduTypesTest
 FixedAndVariableDatumRoundTripTest
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] Using network interface Intel(R) Dual Band Wireless-AC 8260
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 2. received DISPDUType 17 ACTION_RESPONSE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 1. received DISPDUType 17 ACTION_RESPONSE
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 17 ACTION_RESPONSE (timestamp 05:37:20, size 128 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DISPDUType 17 ACTION_RESPONSE (timestamp 05:37:20, size 128 bytes)
 X3dInterpolatorsTest
 testInterpolators
 Replaying DIS logs.
 Replaying C:\x3d-github\open-dis7-java\.\pduLog\Pdusave.dislog
 ENCODING_PLAINTEXT
 Sent PDU: DISPDUType 25 TRANSMITTER
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 25 TRANSMITTER (timestamp 07:03:22, size 107 bytes)
 Sent PDU: DISPDUType 1 ENTITY_STATE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 2. received DISPDUType 25 TRANSMITTER
 Sent PDU: DISPDUType 41 ENVIRONMENTAL_PROCESS
 Sent PDU: DISPDUType 41 ENVIRONMENTAL_PROCESS
 Sent PDU: DISPDUType 20 DATA
@@ -369,7 +370,7 @@ Sent PDU: DISPDUType 41 ENVIRONMENTAL_PROCESS
 Sent PDU: DISPDUType 41 ENVIRONMENTAL_PROCESS
 Sent PDU: DISPDUType 1 ENTITY_STATE
 Sent PDU: DISPDUType 20 DATA
-Sent PDU: DISPDUType 41 ENVIRONMENTAL_PROCESS
+100Sent PDU: DISPDUType 41 ENVIRONMENTAL_PROCESS
 Sent PDU: DISPDUType 1 ENTITY_STATE
 Sent PDU: DISPDUType 1 ENTITY_STATE
 Sent PDU: DISPDUType 25 TRANSMITTER
@@ -511,7 +512,6 @@ keyValue = ' 0 0 0  0.851 1.82 0.204  0.941 1.971 0.271  2.099 3.391 1.667  2.41
 keyValue = ' 0 0 1 0.062  0 0 1 -0.097  0 0 1 -0.104  0 0 1 -0.163  0 0 1 -0.174  0 0 1 -0.212  0 0 1 -0.211  0 0 1 -0.213  0 0 1 -0.212  0 0 1 -0.212  0 0 1 -0.212  0 0 1 -0.211  0 0 1 -0.211  0 0 1 -0.211  0 0 1 -0.212  0 0 1 -0.212  0 0 1 -0.212  0 0 1 -0.211  0 0 1 -0.212  0 0 1 -0.263  0 0 1 -0.272  0 0 1 0.497  0 0 1 0.468  0 0 1 0.368  0 0 1 0.358  0 0 1 0.322  0 0 1 0.316  0 0 1 0.286  0 0 1 0.284  0 0 1 0.283  0 0 1 0.283  0 0 1 0.283  0 0 1 0.283  0 0 1 0.275  0 0 1 0.277  0 0 1 0.3  0 0 1 0.298  0 0 1 0.294  0 0 1 0.294  0 0 1 0.291  0 0 1 0.29  0 0 1 0.29  0 0 1 0.29  0 0 1 0.292  0 0 1 0.292  0 0 1 0.29  0 0 1 0.29  0 0 1 0.284  0 0 1 0.277  0 0 1 0.274  0 0 1 0.266  0 0 1 0.262 ' />
 <OrientationInterpolator DEF='EntityOrientationY' key = '0 0.038 0.039 0.046 0.048 0.063 0.067 0.116 0.118 0.167 0.172 0.255 0.32 0.385 0.39 0.435 0.454 0.517 0.518 0.527 0.528 0.535 0.536 0.54 0.541 0.544 0.545 0.548 0.549 0.569 0.578 0.62 0.641 0.713 0.713 0.735 0.735 0.767 0.767 0.814 0.844 0.896 0.903 0.946 0.949 0.992 0.993 0.996 0.997 0.998 0.999 1 ' 
 keyValue = ' 0 1 0 -0.191  0 1 0 -0.152  0 1 0 -0.146  0 1 0 -0.064  0 1 0 -0.039  0 1 0 0.058  0 1 0 0.059  0 1 0 0.058  0 1 0 0.057  0 1 0 0.058  0 1 0 0.058  0 1 0 0.055  0 1 0 0.055  0 1 0 0.055  0 1 0 0.054  0 1 0 0.054  0 1 0 0.054  0 1 0 0.054  0 1 0 0.058  0 1 0 0.136  0 1 0 0.144  0 1 0 0.186  0 1 0 0.18  0 1 0 0.115  0 1 0 0.101  0 1 0 0.026  0 1 0 0.012  0 1 0 -0.061  0 1 0 -0.066  0 1 0 -0.065  0 1 0 -0.065  0 1 0 -0.065  0 1 0 -0.069  0 1 0 -0.085  0 1 0 -0.081  0 1 0 -0.03  0 1 0 -0.034  0 1 0 -0.044  0 1 0 -0.044  0 1 0 -0.05  0 1 0 -0.052  0 1 0 -0.052  0 1 0 -0.052  0 1 0 -0.053  0 1 0 -0.053  0 1 0 -0.052  0 1 0 -0.052  0 1 0 -0.066  0 1 0 -0.077  0 1 0 -0.084  0 1 0 -0.097  0 1 0 -0.104 ' />
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 1. received DISPDUType 22 COMMENT
 <OrientationInterpolator DEF='EntityOrientationX' key = '0 0.038 0.039 0.046 0.048 0.063 0.067 0.116 0.118 0.167 0.172 0.255 0.32 0.385 0.39 0.435 0.454 0.517 0.518 0.527 0.528 0.535 0.536 0.54 0.541 0.544 0.545 0.548 0.549 0.569 0.578 0.62 0.641 0.713 0.713 0.735 0.735 0.767 0.767 0.814 0.844 0.896 0.903 0.946 0.949 0.992 0.993 0.996 0.997 0.998 0.999 1 ' 
 keyValue = ' 1 0 0 0.499  1 0 0 -0.359  1 0 0 -0.353  1 0 0 -0.315  1 0 0 -0.312  1 0 0 -0.313  1 0 0 -0.312  1 0 0 -0.314  1 0 0 -0.314  1 0 0 -0.314  1 0 0 -0.314  1 0 0 -0.313  1 0 0 -0.313  1 0 0 -0.313  1 0 0 -0.314  1 0 0 -0.314  1 0 0 -0.314  1 0 0 -0.313  1 0 0 -0.314  1 0 0 -0.344  1 0 0 -0.35  1 0 0 0.44  1 0 0 0.414  1 0 0 0.331  1 0 0 0.325  1 0 0 0.31  1 0 0 0.309  1 0 0 0.314  1 0 0 0.315  1 0 0 0.316  1 0 0 0.316  1 0 0 0.316  1 0 0 0.316  1 0 0 0.319  1 0 0 0.318  1 0 0 0.31  1 0 0 0.311  1 0 0 0.312  1 0 0 0.312  1 0 0 0.313  1 0 0 0.313  1 0 0 0.313  1 0 0 0.312  1 0 0 0.311  1 0 0 0.312  1 0 0 0.313  1 0 0 0.313  1 0 0 0.315  1 0 0 0.318  1 0 0 0.32  1 0 0 0.324  1 0 0 0.326 ' />
 DISTools.Regression.doRegression()
@@ -521,45 +521,46 @@ Writing X3D LineSet
 </LineSet> 
 
 CommentPdusTest
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] Using network interface Intel(R) Dual Band Wireless-AC 8260
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 2. received DISPDUType 22 COMMENT
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 3. received DISPDUType 22 COMMENT
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 4. received DISPDUType 22 COMMENT
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 5. received DISPDUType 62 COMMENT_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 6. received DISPDUType 62 COMMENT_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 7. received DISPDUType 62 COMMENT_RELIABLE
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 8. received DISPDUType 62 COMMENT_RELIABLE
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 22 COMMENT (timestamp 06:39:27, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 22 COMMENT (timestamp 06:41:28, size 56 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DISPDUType 22 COMMENT (timestamp 06:43:28, size 72 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DISPDUType 22 COMMENT (timestamp 06:45:27, size 128 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. received DISPDUType 62 COMMENT_RELIABLE (timestamp 06:47:28, size 32 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. received DISPDUType 62 COMMENT_RELIABLE (timestamp 06:49:28, size 56 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. received DISPDUType 62 COMMENT_RELIABLE (timestamp 06:51:29, size 88 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. received DISPDUType 62 COMMENT_RELIABLE (timestamp 06:53:29, size 128 bytes)
 PduFactoryTest
 MarshalEnumsTest
 DataQueryPduRoundTripTest
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] Using network interface Intel(R) Dual Band Wireless-AC 8260
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 9. received DISPDUType 18 DATA_QUERY
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 1. received DISPDUType 18 DATA_QUERY
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 18 DATA_QUERY (timestamp 06:58:48, size 128 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. received DISPDUType 18 DATA_QUERY (timestamp 06:58:48, size 128 bytes)
 CreateAllObjectTypesTest
 SignalPdusTest
 Recorder log file open: C:\x3d-github\open-dis7-java\pduLog\PduCaptureLog.dislog
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] Using network interface Intel(R) Dual Band Wireless-AC 8260
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 2. received DISPDUType 26 SIGNAL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 1. received DISPDUType 26 SIGNAL
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Dual Band Wireless-AC 8260
 class edu.nps.moves.dis7.utilities.stream.PduRecorder listening to IP address 225.4.5.6 on port 3000
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 2. received DISPDUType 26 SIGNAL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 3. received DISPDUType 31 INTERCOM_SIGNAL
-[edu.nps.moves.dis7.utilities.DisThreadedNetIF] 4. received DISPDUType 31 INTERCOM_SIGNAL
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 26 SIGNAL (timestamp 07:02:06, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 26 SIGNAL (timestamp 07:02:06, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 26 SIGNAL (timestamp 07:02:06, size 50 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DISPDUType 31 INTERCOM_SIGNAL (timestamp 07:02:06, size 33 bytes)
+[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DISPDUType 31 INTERCOM_SIGNAL (timestamp 07:02:06, size 58 bytes)
 testRoundTripNet
 
-ENCODING_PLAINTEXT
 Closing recorder log file: C:\x3d-github\open-dis7-java\pduLog\PduCaptureLog.dislog
 testRoundTripLog
 Replaying DIS logs.
+ENCODING_PLAINTEXT
 Replaying C:\x3d-github\open-dis7-java\.\pduLog\PduCaptureLog.dislog
 Total PDUs: 4
 End of replay from PduCaptureLog.dislog
 
 Closing recorder log file: C:\x3d-github\open-dis7-java\pduLog\PduCaptureLog.dislog
 ObjectTypeMarshallTest
-Name: edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire._2Roll	Domain: PlatformDomain 1 LAND	Kind: ObjectKind 1 OBSTACLE	Category: 2	Subcategory: 1
+Name: edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire._2Roll	Domain: PlatformDomain 1 LAND	Kind: ObjectKind 1 OBSTACLE	Category: 2	Subcategory: 1
 01 01 02 01 
-Name: edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.TracksTire.TracksTire	Domain: PlatformDomain 1 LAND	Kind: ObjectKind 3 CULTURAL_FEATURE	Category: 2	Subcategory: 0
+Name: edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.TracksTire.TracksTire	Domain: PlatformDomain 1 LAND	Kind: ObjectKind 3 CULTURAL_FEATURE	Category: 2	Subcategory: 0
 01 03 02 00 
 NullFieldsEntityMarshallTest
 .
@@ -569,7 +570,7 @@ NullFieldsEntityMarshallTest
   +-- Bit Field Round TripTest [OK]
   | '-- testRoundTrip() [OK]
   +-- Entity State Pdu Test [OK]
-  | '-- testEntityCapabilities() [OK]
+  | '-- testRoundTrip() [OK]
   +-- CreateAllPduTypesTest [OK]
   | '-- testCreateAll() [OK]
   +-- Fixed and Variable Datum Round Trip Test [OK]
@@ -596,7 +597,7 @@ NullFieldsEntityMarshallTest
     +-- testGoodMarshall() [OK]
     '-- testNoSpecificNoExtraMarshal() [OK]
 
-Test run finished after 5508 ms
+Test run finished after 5687 ms
 [        15 containers found      ]
 [         0 containers skipped    ]
 [        15 containers started    ]
@@ -610,267 +611,14 @@ Test run finished after 5508 ms
 [        17 tests successful      ]
 [         0 tests failed          ]
 
-Processing C:\x3d-github\open-dis7-java\build\test\results\TESTS-TestSuites.xml to C:\Users\brutzman\AppData\Local\Temp\null71584829
+Processing C:\x3d-github\open-dis7-java\build\test\results\TESTS-TestSuites.xml to C:\Users\brutzman\AppData\Local\Temp\null576637417
 Loading stylesheet jar:file:/C:/apache-ant-1.10.8/lib/ant-junit.jar!/org/apache/tools/ant/taskdefs/optional/junit/xsl/junit-frames.xsl
-Transform time: 495ms
-Deleting: C:\Users\brutzman\AppData\Local\Temp\null71584829
+Transform time: 311ms
+Deleting: C:\Users\brutzman\AppData\Local\Temp\null576637417
 ================
 javadoc:
 Generating Javadoc
 Javadoc execution
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\APA.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AcknowledgePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AcknowledgeRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AcknowledgeReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AcousticEmitter.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ActionRequestPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ActionRequestRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ActionRequestReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ActionResponsePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ActionResponseRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ActionResponseReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AggregateIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AggregateMarking.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AggregateStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AggregateType.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Align.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AngleDeception.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AngularVelocityVector.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AntennaLocation.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Appearance.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AppearancePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ArealObjectStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ArticulatedPartVP.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ArticulatedPartsPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Association.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AttachedPartVP.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Attribute.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AttributePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\AttributeRecordSet.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\BeamAntennaPattern.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\BeamData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\BeamStatus.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\BlankingSector.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Category.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ChangeOptions.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ClockTime.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CollisionElasticPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CollisionPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CommentPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CommentRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CommentReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CommunicationsNodeID.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CreateEntityPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CreateEntityRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\CreateEntityReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataFilterRecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataQueryDatumSpecification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataQueryPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataQueryRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataQueryReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DataReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DatumSpecification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DeadReckoningParameters.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DesignatorPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DetonationPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DirectedEnergyAreaAimpoint.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DirectedEnergyDamage.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DirectedEnergyFirePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DirectedEnergyPrecisionAimpoint.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DirectedEnergyTargetEnergyDeposition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DisBitSet.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DisTime.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\DistributedEmissionsFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EEFundamentalParameterData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ElectromagneticEmissionPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ElectronicEmitter.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EmitterBeam.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EmitterSystem.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EngineFuel.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EngineFuelReload.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityAssociationVP.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityCapabilities.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityDamageStatusPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityID.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityInformationFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityManagementFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityMarking.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityStateUpdatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityType.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityTypeRaw.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EntityTypeVP.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EnumNotFoundException.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Environment.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EnvironmentalProcessPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EulerAngles.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EventIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EventIdentifierLiveEntity.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EventReportPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EventReportRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\EventReportReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Expendable.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ExpendableDescriptor.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ExpendableReload.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ExplosionDescriptor.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\FalseTargetsAttribute.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\FastEntityStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\FirePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\FixedDatum.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\FundamentalOperationalData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridAxisDescriptor.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridAxisDescriptorFixed.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridAxisDescriptorVariable.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridDataType0.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridDataType1.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GridDataType2.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GriddedDataPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\GroupID.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IFFData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IFFFundamentalParameterData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IFFLayer2Pdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IFFPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IOCommsNodeRecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IOEffectRecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IORecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IdentificationFriendOrFoePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IffDataSpecification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\InformationOperationsActionPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\InformationOperationsFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\InformationOperationsReportPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomCommunicationsParameters.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomControlPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomReferenceID.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomSignalPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IsGroupOfPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IsPartOfPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\JammingTechnique.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LEDetonationPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LEFirePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LEVector3FixedByte.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LaunchedMunitionRecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LayerHeader.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LinearObjectStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LinearSegmentParameter.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveDeadReckoningParameters.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityDetonationPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityFirePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityLinearVelocity.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityOrientation.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityOrientation16.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityOrientationError.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityPositionError.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveEntityRelativeWorldCoordinates.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LiveSimulationAddress.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\LogisticsFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Marshaller.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MineEmplacementTime.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MineEntityIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldDataPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldQueryPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldResponseNACKPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldSensorType.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MinefieldStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ModulationParameters.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ModulationType.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Munition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MunitionDescriptor.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\MunitionReload.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\NamedLocationIdentification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ObjectIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ObjectType.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\OwnershipStatusRecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Pdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\PduBase.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\PduStatus.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\PointObjectStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\PropulsionSystemData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ProtocolMode.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RadioCommsHeader.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RadioCommunicationsFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RadioIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RadioType.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ReceiverPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordQueryRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordQueryReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordQuerySpecification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordSpecification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RecordSpecificationElement.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Relationship.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RemoveEntityPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RemoveEntityRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RemoveEntityReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RepairCompletePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RepairResponsePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\RequestID.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ResupplyCancelPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ResupplyOfferPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ResupplyReceivedPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SEESPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SecondaryOperationalData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Sensor.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SeparationVP.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ServiceRequestPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SetDataPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SetDataRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SetDataReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SetRecordRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SetRecordReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\ShaftRPM.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SignalPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SilentEntitySystem.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SimulationAddress.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SimulationIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SimulationManagementFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SimulationManagementWithReliabilityFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StandardVariableRecord.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StandardVariableSpecification.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StartResumePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StartResumeRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StartResumeReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StopFreezePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StopFreezeRPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StopFreezeReliablePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StorageFuel.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\StorageFuelReload.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SubCategory.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SupplementalEmissionEntityStatePdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SupplyQuantity.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SyntheticEnvironmentFamilyPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\SystemIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\TSPIPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\TimeSpacePositionInformationPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\TotalRecordSets.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\TrackJamData.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\TransferOwnershipPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\TransmitterPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\UABeam.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\UAEmitter.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\UAFundamentalParameter.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\UnattachedIdentifier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\UnderwaterAcousticPdu.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\UnsignedDISInteger.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\VariableDatum.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\VariableParameter.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\VariableTransmitterParameters.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Vector2Float.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Vector3Double.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Vector3Float.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\VectoringNozzleSystem.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\WarfareFamilyPdu.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\EntityTypeFactory.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\afg\lifeform\land\AfghanBorderPoliceABP.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\afg\lifeform\land\AfghanBorderPolicewRPG7.java...
@@ -10551,9 +10299,11 @@ Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\land\LiquidSpill.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\land\Other.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\land\PowderSpill.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\land\PowderSpillResidue.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\land\Radarcollectednoise.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\space\Unused.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\subsurface\Biologics.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\subsurface\Bioluminescence.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\subsurface\CurrentProfile.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\subsurface\DebrisClutter.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\entities\oth\environmental\subsurface\IceBerg.java...
@@ -22178,215 +21928,468 @@ Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\jammers\Noise\VelocityBinMaskingVBM\VelocityBinMaskingVBM.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\jammers\Special\Special.java...
 Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\jammers\Special\SuperJam\SuperJam.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\ArealObject.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Minefield\Hasty.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Minefield\Minefield.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Minefield\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Minefield\Prepared.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Minefield\Scattered.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Minefield\Solitary.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Obstacle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\ArealObject\Obstacle\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Culturalfeature\Culturalfeature.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Culturalfeature\TracksTire\TracksTire.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Culturalfeature\Wire\Wire.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Culturalfeature\Wire\WireCrush.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\LinearObject.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\ChainLinkFence\ChainLinkFence.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\ConcertinaWire\ConcertinaWire.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\ConcertinaWire\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\ConcertinaWire\_2Roll.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\ConcertinaWire\_3Roll.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\ConcreteBarrier\ConcreteBarrier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\Obstacle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\Rut\Rut.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\SpeedBump\SpeedBump.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\TankDitch\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstacle\TankDitch\TankDitch.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclebreach\Breach\Breach.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclebreach\Breach\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclebreach\Obstaclebreach.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclebreach\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclemarker\MinefieldLaneMarker\MinefieldLaneMarker.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclemarker\MinefieldLaneMarker\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclemarker\Obstaclemarker.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Obstaclemarker\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Tacticalsmoke\ExhaustSmoke\ExhaustSmoke.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Tacticalsmoke\ExhaustSmoke\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Tacticalsmoke\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\LinearObject\Tacticalsmoke\Tacticalsmoke.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingRubble\BuildingRubble.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingRubble\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\ApartmentBuilding.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\BuildingStructure.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\Church.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\FOBGuardTower.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\FOBTrailerOffice.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\GovernmentBuilding.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\GuardHouse.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\Hanger.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\IndustrialBuilding.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\MicrowaveTower.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\PortaPotty.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\PowerPylon.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\RadioTVTower.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\RadioTower1000ft.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\RadioTower100ft.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\RadioTower500ft.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\School.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\TransformerYard.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\BuildingStructure\Windmill.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuilding.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingBridgeSingle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingFOB.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingHouseDouble.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingHouseSingle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingHouseSingleRailing.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingMosqueSingle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingStoreSingle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Culturalfeature.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\DisturbedEarth\DisturbedEarth.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoad.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoadAsphalt.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoadConcrete.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoadGravel.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\IndustrialProcessingPlant\IndustrialProcessingPlant.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\IndustrialProcessingPlant\OilRefinery.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuilding.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingApartment.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingChurch.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingControlTower.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingFarmHouse.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingFireStation.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingGasStation.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingHospital.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingHouse.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingMudbrickHouse.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingMudbrickStore.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingOfficeBuilding.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingPoliceStation.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingPowerStation.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingSchool.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingStore.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingWarehouse.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingWaterTower.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MaintenanceStructure\LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MaintenanceStructure\LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MaintenanceStructure\LightweightMaintenanceEnclosureLMEBradley.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MaintenanceStructure\LightweightMaintenanceEnclosureLMEM1.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\MaintenanceStructure\MaintenanceStructure.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Pump\Pump.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Pump\PumpGas.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\Tent.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentArctic.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentBedouin.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentChemicallyandBiologicalProtectedShelterCBPS.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentExpandableFrame.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentFritsche.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentKuchi.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentLarge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentMedium.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentModularGeneralPurposeTentSystemMGPTS.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentSmall.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\Tent\TentTEMPER.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduous.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduousLarge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduousMedium.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduousSmall.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreen.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreenLarge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreenMedium.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreenSmall.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Culturalfeature\UtilityPole\UtilityPole.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\EnvironmentalObject\EnvironmentalObject.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\EnvironmentalObject\Flood\Flood.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\EnvironmentalObject\Flood\FloodLarge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\EnvironmentalObject\Flood\FloodMedium.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\EnvironmentalObject\Flood\FloodSmall.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Abatis\Abatis.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Abatis\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Abatis\_14Tree.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Abatis\_8Tree.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\Barrier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierConstruction.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierFenceChain6foot.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierFenceWood6foot.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketDoubleStacked.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketLarge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketMedium.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketSmall.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierJerseyPlastic.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\BarrierTexas.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Barrier\DragonsTeeth.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Crater\Crater.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Crater\Large.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Crater\Medium.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Crater\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Crater\Small.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\LogCrib\LogCrib.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\LogCrib\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\LogCrib\Rectangular.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\LogCrib\Triangular.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Obstacle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\PotHole\PotHole.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\RockDrop\RockDrop.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\RockDrop\RockDropCovered.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstacle\RockDrop\RockDropUncovered.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstaclemarker\NBCHazardMarker\NBCHazardMarker.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Obstaclemarker\Obstaclemarker.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\AVLB\AVLB.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\AVLB\JointAssaultBridgeJAB.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\AVLB\M60A1.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\AVLB\MTU20.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\AVLB\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\Passageway.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\Pier\Pier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\RibbonBridge\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\RibbonBridge\RibbonBridge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\RibbonBridge\_2Lane.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\RibbonBridge\_4Lane.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\StationaryBridge\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\StationaryBridge\StationaryBridge.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\StationaryBridge\_2Lane.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Passageway\StationaryBridge\_4Lane.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\PointObject.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\CoveredMachineGunBunker.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\HastyFightingPosition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\InfantryFightingPosition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\NonCoveredInfantryPosition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\NonCoveredMachineGunBunker.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\InfantryFightingPosition\OverheadCoveredInfantryPosition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\Preparedposition.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\VehicleDefilade\ArmoredVehicle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\VehicleDefilade\FightingVehicle.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\VehicleDefilade\MortarCarrier.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\VehicleDefilade\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\VehicleDefilade\Tank.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Preparedposition\VehicleDefilade\VehicleDefilade.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\AirBurst\AirBurst.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\AirBurst\Grenade.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\AirBurst\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\GroundBurst\Artillery.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\GroundBurst\GroundBurst.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\GroundBurst\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\Other\Other.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Green.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Red.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Violet.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Yellow.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M83White.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\TacticalSmokeCanister.java...
-Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objecttypes\PointObject\Tacticalsmoke\Tacticalsmoke.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\ArealObject.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Minefield\Hasty.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Minefield\Minefield.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Minefield\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Minefield\Prepared.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Minefield\Scattered.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Minefield\Solitary.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Obstacle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\ArealObject\Obstacle\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Culturalfeature\Culturalfeature.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Culturalfeature\TracksTire\TracksTire.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Culturalfeature\Wire\Wire.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Culturalfeature\Wire\WireCrush.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\LinearObject.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\ChainLinkFence\ChainLinkFence.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\ConcertinaWire\ConcertinaWire.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\ConcertinaWire\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\ConcertinaWire\_2Roll.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\ConcertinaWire\_3Roll.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\ConcreteBarrier\ConcreteBarrier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\Obstacle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\Rut\Rut.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\SpeedBump\SpeedBump.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\TankDitch\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstacle\TankDitch\TankDitch.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclebreach\Breach\Breach.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclebreach\Breach\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclebreach\Obstaclebreach.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclebreach\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclemarker\MinefieldLaneMarker\MinefieldLaneMarker.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclemarker\MinefieldLaneMarker\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclemarker\Obstaclemarker.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Obstaclemarker\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Tacticalsmoke\ExhaustSmoke\ExhaustSmoke.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Tacticalsmoke\ExhaustSmoke\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Tacticalsmoke\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\LinearObject\Tacticalsmoke\Tacticalsmoke.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingRubble\BuildingRubble.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingRubble\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\ApartmentBuilding.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\BuildingStructure.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\Church.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\FOBGuardTower.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\FOBTrailerOffice.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\GovernmentBuilding.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\GuardHouse.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\Hanger.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\IndustrialBuilding.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\MicrowaveTower.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\PortaPotty.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\PowerPylon.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\RadioTVTower.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\RadioTower1000ft.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\RadioTower100ft.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\RadioTower500ft.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\School.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\TransformerYard.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\BuildingStructure\Windmill.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuilding.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingBridgeSingle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingFOB.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingHouseDouble.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingHouseSingle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingHouseSingleRailing.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingMosqueSingle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\ContainerBasedBuilding\ContainerBasedBuildingStoreSingle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Culturalfeature.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\DisturbedEarth\DisturbedEarth.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoad.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoadAsphalt.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoadConcrete.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\DisturbedRoad\DisturbedRoadGravel.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\IndustrialProcessingPlant\IndustrialProcessingPlant.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\IndustrialProcessingPlant\OilRefinery.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuilding.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingApartment.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingChurch.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingControlTower.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingFarmHouse.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingFireStation.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingGasStation.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingHospital.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingHouse.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingMudbrickHouse.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingMudbrickStore.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingOfficeBuilding.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingPoliceStation.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingPowerStation.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingSchool.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingStore.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingWarehouse.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MOUTBuilding\MOUTBuildingWaterTower.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MaintenanceStructure\LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MaintenanceStructure\LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MaintenanceStructure\LightweightMaintenanceEnclosureLMEBradley.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MaintenanceStructure\LightweightMaintenanceEnclosureLMEM1.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\MaintenanceStructure\MaintenanceStructure.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Pump\Pump.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Pump\PumpGas.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\Tent.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentArctic.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentBedouin.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentChemicallyandBiologicalProtectedShelterCBPS.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentExpandableFrame.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentFritsche.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentKuchi.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentLarge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentMedium.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentModularGeneralPurposeTentSystemMGPTS.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentSmall.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\Tent\TentTEMPER.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduous.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduousLarge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduousMedium.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeDeciduous\TreeDeciduousSmall.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreen.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreenLarge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreenMedium.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\TreeEvergreen\TreeEvergreenSmall.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Culturalfeature\UtilityPole\UtilityPole.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\EnvironmentalObject\EnvironmentalObject.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\EnvironmentalObject\Flood\Flood.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\EnvironmentalObject\Flood\FloodLarge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\EnvironmentalObject\Flood\FloodMedium.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\EnvironmentalObject\Flood\FloodSmall.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Abatis\Abatis.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Abatis\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Abatis\_14Tree.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Abatis\_8Tree.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\Barrier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierConstruction.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierFenceChain6foot.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierFenceWood6foot.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketDoubleStacked.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketLarge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketMedium.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierHESCOBasketSmall.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierJerseyPlastic.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\BarrierTexas.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Barrier\DragonsTeeth.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Crater\Crater.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Crater\Large.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Crater\Medium.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Crater\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Crater\Small.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\LogCrib\LogCrib.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\LogCrib\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\LogCrib\Rectangular.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\LogCrib\Triangular.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Obstacle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\PotHole\PotHole.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\RockDrop\RockDrop.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\RockDrop\RockDropCovered.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstacle\RockDrop\RockDropUncovered.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstaclemarker\NBCHazardMarker\NBCHazardMarker.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Obstaclemarker\Obstaclemarker.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\AVLB\AVLB.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\AVLB\JointAssaultBridgeJAB.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\AVLB\M60A1.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\AVLB\MTU20.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\AVLB\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\Passageway.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\Pier\Pier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\RibbonBridge\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\RibbonBridge\RibbonBridge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\RibbonBridge\_2Lane.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\RibbonBridge\_4Lane.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\StationaryBridge\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\StationaryBridge\StationaryBridge.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\StationaryBridge\_2Lane.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Passageway\StationaryBridge\_4Lane.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\PointObject.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\CoveredMachineGunBunker.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\HastyFightingPosition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\InfantryFightingPosition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\NonCoveredInfantryPosition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\NonCoveredMachineGunBunker.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\InfantryFightingPosition\OverheadCoveredInfantryPosition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\Preparedposition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\VehicleDefilade\ArmoredVehicle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\VehicleDefilade\FightingVehicle.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\VehicleDefilade\MortarCarrier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\VehicleDefilade\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\VehicleDefilade\Tank.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Preparedposition\VehicleDefilade\VehicleDefilade.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\AirBurst\AirBurst.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\AirBurst\Grenade.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\AirBurst\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\GroundBurst\Artillery.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\GroundBurst\GroundBurst.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\GroundBurst\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\Other\Other.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Green.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Red.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Violet.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M18Yellow.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\M83White.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\TacticalSmokeCanister\TacticalSmokeCanister.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\objectTypes\PointObject\Tacticalsmoke\Tacticalsmoke.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\APA.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AcknowledgePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AcknowledgeRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AcknowledgeReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AcousticEmitter.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ActionRequestPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ActionRequestRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ActionRequestReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ActionResponsePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ActionResponseRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ActionResponseReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AggregateIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AggregateMarking.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AggregateStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AggregateType.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Align.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AngleDeception.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AngularVelocityVector.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AntennaLocation.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Appearance.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AppearancePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ArealObjectStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ArticulatedPartVP.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ArticulatedPartsPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Association.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AttachedPartVP.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Attribute.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AttributePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\AttributeRecordSet.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\BeamAntennaPattern.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\BeamData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\BeamStatus.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\BlankingSector.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Category.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ChangeOptions.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ClockTime.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CollisionElasticPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CollisionPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CommentPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CommentRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CommentReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CommunicationsNodeID.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CreateEntityPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CreateEntityRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\CreateEntityReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataFilterRecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataQueryDatumSpecification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataQueryPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataQueryRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataQueryReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DataReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DatumSpecification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DeadReckoningParameters.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DesignatorPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DetonationPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DirectedEnergyAreaAimpoint.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DirectedEnergyDamage.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DirectedEnergyFirePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DirectedEnergyPrecisionAimpoint.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DirectedEnergyTargetEnergyDeposition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DisBitSet.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DisTime.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\DistributedEmissionsFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EEFundamentalParameterData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ElectromagneticEmissionPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ElectronicEmitter.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EmitterBeam.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EmitterSystem.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EngineFuel.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EngineFuelReload.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityAssociationVP.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityCapabilities.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityDamageStatusPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityID.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityInformationFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityManagementFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityMarking.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityStateUpdatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityType.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityTypeRaw.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EntityTypeVP.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EnumNotFoundException.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Environment.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EnvironmentalProcessPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EulerAngles.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EventIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EventIdentifierLiveEntity.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EventReportPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EventReportRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\EventReportReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Expendable.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ExpendableDescriptor.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ExpendableReload.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ExplosionDescriptor.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\FalseTargetsAttribute.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\FastEntityStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\FirePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\FixedDatum.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\FundamentalOperationalData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridAxisDescriptor.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridAxisDescriptorFixed.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridAxisDescriptorVariable.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridDataType0.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridDataType1.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GridDataType2.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GriddedDataPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\GroupID.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IFFData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IFFFundamentalParameterData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IFFLayer2Pdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IFFPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IOCommsNodeRecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IOEffectRecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IORecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IdentificationFriendOrFoePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IffDataSpecification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\InformationOperationsActionPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\InformationOperationsFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\InformationOperationsReportPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IntercomCommunicationsParameters.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IntercomControlPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IntercomIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IntercomReferenceID.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IntercomSignalPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IsGroupOfPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\IsPartOfPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\JammingTechnique.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LEDetonationPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LEFirePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LEVector3FixedByte.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LaunchedMunitionRecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LayerHeader.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LinearObjectStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LinearSegmentParameter.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveDeadReckoningParameters.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityDetonationPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityFirePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityLinearVelocity.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityOrientation.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityOrientation16.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityOrientationError.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityPositionError.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveEntityRelativeWorldCoordinates.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LiveSimulationAddress.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\LogisticsFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Marshaller.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MineEmplacementTime.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MineEntityIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldDataPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldQueryPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldResponseNACKPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldSensorType.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MinefieldStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ModulationParameters.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ModulationType.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Munition.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MunitionDescriptor.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\MunitionReload.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\NamedLocationIdentification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ObjectIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ObjectType.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\OwnershipStatusRecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Pdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\PduBase.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\PduStatus.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\PointObjectStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\PropulsionSystemData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ProtocolMode.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RadioCommsHeader.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RadioCommunicationsFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RadioIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RadioType.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ReceiverPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordQueryRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordQueryReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordQuerySpecification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordSpecification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RecordSpecificationElement.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Relationship.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RemoveEntityPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RemoveEntityRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RemoveEntityReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RepairCompletePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RepairResponsePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\RequestID.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ResupplyCancelPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ResupplyOfferPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ResupplyReceivedPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SEESPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SecondaryOperationalData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Sensor.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SeparationVP.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ServiceRequestPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SetDataPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SetDataRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SetDataReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SetRecordRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SetRecordReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\ShaftRPM.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SignalPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SilentEntitySystem.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SimulationAddress.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SimulationIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SimulationManagementFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SimulationManagementWithReliabilityFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StandardVariableRecord.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StandardVariableSpecification.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StartResumePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StartResumeRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StartResumeReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StopFreezePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StopFreezeRPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StopFreezeReliablePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StorageFuel.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\StorageFuelReload.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SubCategory.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SupplementalEmissionEntityStatePdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SupplyQuantity.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SyntheticEnvironmentFamilyPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\SystemIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\TSPIPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\TimeSpacePositionInformationPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\TotalRecordSets.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\TrackJamData.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\TransferOwnershipPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\TransmitterPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\UABeam.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\UAEmitter.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\UAFundamentalParameter.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\UnattachedIdentifier.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\UnderwaterAcousticPdu.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\UnsignedDISInteger.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\VariableDatum.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\VariableParameter.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\VariableTransmitterParameters.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Vector2Float.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Vector3Double.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Vector3Float.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\VectoringNozzleSystem.java...
+Loading source file C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\WarfareFamilyPdu.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\AlphabeticalPduSender.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\ClassNameComparator.java...
-Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EntityUse.java...
+Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EntityStateEntityIdExampleUse.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EspduReceiver.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EspduReceiverNIO.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EspduSender.java...
@@ -22395,9 +22398,9 @@ Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\PduReaderPlayer.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\ThreadedNetExample.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\CoordinateConversions.java...
-Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\DisNetworking.java...
-Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\DisThreadedNetIF.java...
+Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\DisThreadedNetworkInterface.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\PduFactory.java...
+Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\TrialDisMulticastNetworkingDeprecated.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\stream\PduPlayer.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\stream\PduReceiver.java...
 Loading source file C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\stream\PduRecorder.java...
@@ -22409,36 +22412,29 @@ Constructing Javadoc information...
 Creating destination directory: "C:\x3d-github\open-dis7-java\javadoc\"
 Standard Doclet version 14.0.2
 Building tree for all the packages and classes...
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java:39: warning: no description for @param
+C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EntityStateEntityIdExampleUse.java:75: warning: no description for @throws
+   * @throws IOException 
+C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java:39: warning: no description for @param
      * @param d
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java:40: warning: no description for @return
+C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java:40: warning: no description for @return
      * @return
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java:49: warning: no description for @param
+C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java:49: warning: no description for @param
      * @param d
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java:50: warning: no description for @return
+C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java:50: warning: no description for @return
      * @return
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java:59: warning: no description for @param
+C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java:59: warning: no description for @param
      * @param d
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\Domain.java:60: warning: no description for @return
+C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\pdus\Domain.java:60: warning: no description for @return
      * @return
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomSignalPdu.java:262: warning: no description for @throws
-   * @throws java.lang.Exception
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\IntercomSignalPdu.java:298: warning: no description for @throws
-   * @throws java.lang.Exception
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\VariableDatum.java:148: warning: no description for @throws
-   * @throws java.lang.Exception
-C:\x3d-github\open-dis7-java\src-generated\edu\nps\moves\dis7\VariableDatum.java:175: warning: no description for @throws
-   * @throws java.lang.Exception
-C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\ClassNameComparator.java:39: warning: no description for @param
-     * @param obj
-C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\examples\EntityUse.java:75: warning: no description for @throws
-   * @throws IOException 
-C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\DisThreadedNetIF.java:189: warning: no description for @param
-   * @param pdu 
+C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\PduFactory.java:62: error: reference not found
+   * @see   edu.nps.moves.dis7.EntityType
+C:\x3d-github\open-dis7-java\src\edu\nps\moves\dis7\utilities\PduFactory.java:63: error: reference not found
+   * @see   edu.nps.moves.dis7.RadioType
 Building index for all the packages and classes...
 Building index for all classes...
 Generating C:\x3d-github\open-dis7-java\javadoc\help-doc.html...
-13 warnings
+2 errors
+7 warnings
 ================
 jar:
 manifest.name          = OpenDIS7 Protocol Data Units (PDUs)
@@ -22447,13 +22443,13 @@ Specification-Title    = IEEE Distributed Interactive Simulation (DIS) Protocol
 Specification-Version  = 7
 Specification-Vendor   = Institute of Electrical and Electronics Engineers (IEEE)
 Implementation-Title   = edu.nps.moves.dis7
-Implementation-Version = 27 August 2020 21:39:24
+Implementation-Version = 30 August 2020 20:43:49
 Implementation-Vendor  = Naval Postgraduate School (NPS)
 jar-classes:
-Building jar: C:\x3d-github\open-dis7-java\dist\open-dis7-classes.jar
+Building jar: C:\x3d-github\open-dis7-java\dist\open-dis7-pdus-classes.jar
 jar-source:
-Building jar: C:\x3d-github\open-dis7-java\dist\open-dis7-source.jar
+Building jar: C:\x3d-github\open-dis7-java\dist\open-dis7-pdus-source.jar
 jar-javadoc:
-Building jar: C:\x3d-github\open-dis7-java\dist\open-dis7-javadoc.jar
+Building jar: C:\x3d-github\open-dis7-java\dist\open-dis7-pdus-javadoc.jar
 build all complete
-BUILD SUCCESSFUL (total time: 5 minutes 7 seconds)
+BUILD SUCCESSFUL (total time: 4 minutes 11 seconds)
diff --git a/build.xml b/build.xml
index 0241a5eb75171dd07559734d345c112ea6a9851e..6165281764726be0c537ff36260dec243e4c6a3b 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,7 @@
         <echo message="build all complete"/>
     </target>
     
-    <target name="clean.pduLog" description="clean recorded pduLog files">
+    <target name="clean-pduLog" description="clean recorded pduLog files">
         <delete verbose="true">
             <fileset dir="pduLog">
                 <include name="*.dislog"/>
@@ -70,6 +70,14 @@
         </delete>
     </target>
     
+    <target name="clean-build">
+        <echo message="warning: be judicious about clean-build, full recompilation may require multiple compilation loops afterward"/>
+        <mkdir dir="build" description="ensure necessary directory present"/>
+        <delete includeemptydirs="true" verbose="false">
+            <fileset dir="build" includes="**/*"/>
+        </delete>
+    </target>
+    
     <target name="compile" description="compile all assets">
         <echo message="compile src, src-generated"/>
         <mkdir dir="build/classes" description="ensure build/classes directory present"/>
diff --git a/src-generated/edu/nps/moves/dis7/APA.java b/src-generated/edu/nps/moves/dis7/APA.java
deleted file mode 100644
index 593fec6b834c7325b02ecb36bede29ab734121c2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/APA.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * additional passive activity
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class APA extends Object implements Serializable
-{
-   protected short  parameterIndex;
-
-   protected short  value;
-
-
-/** Constructor */
- public APA()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // parameterIndex
-   marshalSize += 2;  // value
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link APA#parameterIndex}*/
-public APA setParameterIndex(short pParameterIndex)
-{
-    parameterIndex = pParameterIndex;
-    return this;
-}
-
-/** Getter for {@link APA#parameterIndex}*/
-public short getParameterIndex()
-{
-    return parameterIndex; 
-}
-
-/** Setter for {@link APA#value}*/
-public APA setValue(short pValue)
-{
-    value = pValue;
-    return this;
-}
-
-/** Getter for {@link APA#value}*/
-public short getValue()
-{
-    return value; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(parameterIndex);
-       dos.writeShort(value);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        parameterIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        value = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)parameterIndex);
-   buff.putShort( (short)value);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    parameterIndex = (short)(buff.getShort() & 0xFFFF);
-    value = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final APA rhs = (APA)obj;
-
-     if( ! (parameterIndex == rhs.parameterIndex)) ivarsEqual = false;
-     if( ! (value == rhs.value)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" parameterIndex: ").append(parameterIndex).append("\n");
-    sb.append(" value: ").append(value).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
deleted file mode 100644
index 233d9f2e22af984d68153d0620fa4c7ee29eb597..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.6 Acknowledges the receipt of a Start/Resume PDU, Stop/Freeze PDU, Create Entity PDU, or Remove Entity PDU. See 5.6.5.6.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AcknowledgePdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** type of message being acknowledged uid 69 */
-   protected AcknowledgeAcknowledgeFlag acknowledgeFlag = AcknowledgeAcknowledgeFlag.values()[0];
-
-   /** Whether or not the receiving entity was able to comply with the request uid 70 */
-   protected AcknowledgeResponseFlag responseFlag = AcknowledgeResponseFlag.values()[0];
-
-   /** Request ID that is unique */
-   protected int  requestID;
-
-
-/** Constructor */
- public AcknowledgePdu()
- {
-    setPduType( DISPDUType.ACKNOWLEDGE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += acknowledgeFlag.getMarshalledSize();
-   marshalSize += responseFlag.getMarshalledSize();
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AcknowledgePdu#acknowledgeFlag}*/
-public AcknowledgePdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
-{
-    acknowledgeFlag = pAcknowledgeFlag;
-    return this;
-}
-
-/** Getter for {@link AcknowledgePdu#acknowledgeFlag}*/
-public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
-{
-    return acknowledgeFlag; 
-}
-
-/** Setter for {@link AcknowledgePdu#responseFlag}*/
-public AcknowledgePdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
-{
-    responseFlag = pResponseFlag;
-    return this;
-}
-
-/** Getter for {@link AcknowledgePdu#responseFlag}*/
-public AcknowledgeResponseFlag getResponseFlag()
-{
-    return responseFlag; 
-}
-
-/** Setter for {@link AcknowledgePdu#requestID}*/
-public AcknowledgePdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link AcknowledgePdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       acknowledgeFlag.marshal(dos);
-       responseFlag.marshal(dos);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(dis);
-        uPosition += acknowledgeFlag.getMarshalledSize();
-        responseFlag = AcknowledgeResponseFlag.unmarshalEnum(dis);
-        uPosition += responseFlag.getMarshalledSize();
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   acknowledgeFlag.marshal(buff);
-   responseFlag.marshal(buff);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(buff);
-    responseFlag = AcknowledgeResponseFlag.unmarshalEnum(buff);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AcknowledgePdu rhs = (AcknowledgePdu)obj;
-
-     if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
-     if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
-    sb.append(" responseFlag: ").append(responseFlag).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
deleted file mode 100644
index 1b61bf44bdc3b4e13a4de189c31715a9e3ee971b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.6 Serves the same function as the Acknowledge PDU but is used to acknowledge the receipt of a Create Entity-R PDU, a Remove Entity-R PDU, a Start/Resume-R PDU, or a Stop/Freeze-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AcknowledgeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** ack flags uid 69 */
-   protected AcknowledgeAcknowledgeFlag acknowledgeFlag = AcknowledgeAcknowledgeFlag.values()[0];
-
-   /** response flags uid 70 */
-   protected AcknowledgeResponseFlag responseFlag = AcknowledgeResponseFlag.values()[0];
-
-   /** Request ID */
-   protected int  requestID;
-
-
-/** Constructor */
- public AcknowledgeRPdu()
- {
-    setPduType( DISPDUType.ACKNOWLEDGE_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += acknowledgeFlag.getMarshalledSize();
-   marshalSize += responseFlag.getMarshalledSize();
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AcknowledgeRPdu#acknowledgeFlag}*/
-public AcknowledgeRPdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
-{
-    acknowledgeFlag = pAcknowledgeFlag;
-    return this;
-}
-
-/** Getter for {@link AcknowledgeRPdu#acknowledgeFlag}*/
-public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
-{
-    return acknowledgeFlag; 
-}
-
-/** Setter for {@link AcknowledgeRPdu#responseFlag}*/
-public AcknowledgeRPdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
-{
-    responseFlag = pResponseFlag;
-    return this;
-}
-
-/** Getter for {@link AcknowledgeRPdu#responseFlag}*/
-public AcknowledgeResponseFlag getResponseFlag()
-{
-    return responseFlag; 
-}
-
-/** Setter for {@link AcknowledgeRPdu#requestID}*/
-public AcknowledgeRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link AcknowledgeRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       acknowledgeFlag.marshal(dos);
-       responseFlag.marshal(dos);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(dis);
-        uPosition += acknowledgeFlag.getMarshalledSize();
-        responseFlag = AcknowledgeResponseFlag.unmarshalEnum(dis);
-        uPosition += responseFlag.getMarshalledSize();
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   acknowledgeFlag.marshal(buff);
-   responseFlag.marshal(buff);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(buff);
-    responseFlag = AcknowledgeResponseFlag.unmarshalEnum(buff);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AcknowledgeRPdu rhs = (AcknowledgeRPdu)obj;
-
-     if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
-     if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
-    sb.append(" responseFlag: ").append(responseFlag).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
deleted file mode 100644
index 48263a58d990f0435a1aefb605882f3778b235e9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a AcknowledgeRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AcknowledgeReliablePdu extends AcknowledgeRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
deleted file mode 100644
index 56e793594507db0f316da811244b8d5cc0105a87..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  information about a specific UA emitter. Section 6.2.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AcousticEmitter extends Object implements Serializable
-{
-   /** the system for a particular UA emitter, and an enumeration uid 144 */
-   protected UAAcousticSystemName acousticSystemName = UAAcousticSystemName.values()[0];
-
-   /** The function of the acoustic system uid 145 */
-   protected UAAcousticEmitterSystemFunction acousticFunction = UAAcousticEmitterSystemFunction.values()[0];
-
-   /** The UA emitter identification number relative to a specific system */
-   protected byte  acousticIDNumber;
-
-
-/** Constructor */
- public AcousticEmitter()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += acousticSystemName.getMarshalledSize();
-   marshalSize += acousticFunction.getMarshalledSize();
-   marshalSize += 1;  // acousticIDNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AcousticEmitter#acousticSystemName}*/
-public AcousticEmitter setAcousticSystemName(UAAcousticSystemName pAcousticSystemName)
-{
-    acousticSystemName = pAcousticSystemName;
-    return this;
-}
-
-/** Getter for {@link AcousticEmitter#acousticSystemName}*/
-public UAAcousticSystemName getAcousticSystemName()
-{
-    return acousticSystemName; 
-}
-
-/** Setter for {@link AcousticEmitter#acousticFunction}*/
-public AcousticEmitter setAcousticFunction(UAAcousticEmitterSystemFunction pAcousticFunction)
-{
-    acousticFunction = pAcousticFunction;
-    return this;
-}
-
-/** Getter for {@link AcousticEmitter#acousticFunction}*/
-public UAAcousticEmitterSystemFunction getAcousticFunction()
-{
-    return acousticFunction; 
-}
-
-/** Setter for {@link AcousticEmitter#acousticIDNumber}*/
-public AcousticEmitter setAcousticIDNumber(byte pAcousticIDNumber)
-{
-    acousticIDNumber = pAcousticIDNumber;
-    return this;
-}
-
-/** Getter for {@link AcousticEmitter#acousticIDNumber}*/
-public byte getAcousticIDNumber()
-{
-    return acousticIDNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       acousticSystemName.marshal(dos);
-       acousticFunction.marshal(dos);
-       dos.writeByte(acousticIDNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        acousticSystemName = UAAcousticSystemName.unmarshalEnum(dis);
-        uPosition += acousticSystemName.getMarshalledSize();
-        acousticFunction = UAAcousticEmitterSystemFunction.unmarshalEnum(dis);
-        uPosition += acousticFunction.getMarshalledSize();
-        acousticIDNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   acousticSystemName.marshal(buff);
-   acousticFunction.marshal(buff);
-   buff.put( (byte)acousticIDNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    acousticSystemName = UAAcousticSystemName.unmarshalEnum(buff);
-    acousticFunction = UAAcousticEmitterSystemFunction.unmarshalEnum(buff);
-    acousticIDNumber = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AcousticEmitter rhs = (AcousticEmitter)obj;
-
-     if( ! (acousticSystemName == rhs.acousticSystemName)) ivarsEqual = false;
-     if( ! (acousticFunction == rhs.acousticFunction)) ivarsEqual = false;
-     if( ! (acousticIDNumber == rhs.acousticIDNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" acousticSystemName: ").append(acousticSystemName).append("\n");
-    sb.append(" acousticFunction: ").append(acousticFunction).append("\n");
-    sb.append(" acousticIDNumber: ").append(acousticIDNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
deleted file mode 100644
index 6239077d9e0e36a2dd528060fca78146dd1afc58..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  7.5.7 A request from an SM to a managed entity to perform a specified action. See 5.6.5.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ActionRequestPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** identifies the request being made by the simulation manager */
-   protected int  requestID;
-
-   /** identifies the particular action being requested(see Section 7 of SISO-REF-010). uid 71 */
-   protected ActionRequestActionID actionID = ActionRequestActionID.values()[0];
-
-   /** Number of fixed datum records */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variable length list of fixed datums */
-   protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
- 
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public ActionRequestPdu()
- {
-    setPduType( DISPDUType.ACTION_REQUEST );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += actionID.getMarshalledSize();
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ActionRequestPdu#requestID}*/
-public ActionRequestPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link ActionRequestPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link ActionRequestPdu#actionID}*/
-public ActionRequestPdu setActionID(ActionRequestActionID pActionID)
-{
-    actionID = pActionID;
-    return this;
-}
-
-/** Getter for {@link ActionRequestPdu#actionID}*/
-public ActionRequestActionID getActionID()
-{
-    return actionID; 
-}
-
-/** Setter for {@link ActionRequestPdu#fixedDatums}*/
-public ActionRequestPdu setFixedDatums(List<FixedDatum> pFixedDatums)
-{
-    fixedDatums = pFixedDatums;
-    return this;
-}
-
-/** Getter for {@link ActionRequestPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
-{
-    return fixedDatums; 
-}
-
-/** Setter for {@link ActionRequestPdu#variableDatums}*/
-public ActionRequestPdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link ActionRequestPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       actionID.marshal(dos);
-       dos.writeInt(fixedDatums.size());
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < fixedDatums.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatums.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        actionID = ActionRequestActionID.unmarshalEnum(dis);
-        uPosition += actionID.getMarshalledSize();
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatums.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   actionID.marshal(buff);
-   buff.putInt( (int)fixedDatums.size());
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatums.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    actionID = ActionRequestActionID.unmarshalEnum(buff);
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatums.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ActionRequestPdu rhs = (ActionRequestPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (actionID == rhs.actionID)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatums.size(); idx++)
-        if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" actionID: ").append(actionID).append("\n");
-    sb.append(" fixedDatums: ").append("\n");
-    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
deleted file mode 100644
index b8649ff22bcb4c97ee435caa5ff8bda3bb85fe74..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.7 Serves the same function as the Action Request PDU but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ActionRequestRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   /** padding */
-   protected byte  pad1;
-
-   /** padding */
-   protected short  pad2;
-
-   /** request ID */
-   protected int  requestID;
-
-   /** request ID uid 71 */
-   protected ActionRequestActionID actionID = ActionRequestActionID.values()[0];
-
-   /** Fixed datum record count */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Fixed datum records */
-   protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
- 
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public ActionRequestRPdu()
- {
-    setPduType( DISPDUType.ACTION_REQUEST_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // requestID
-   marshalSize += actionID.getMarshalledSize();
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ActionRequestRPdu#requiredReliabilityService}*/
-public ActionRequestRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link ActionRequestRPdu#pad1}*/
-public ActionRequestRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link ActionRequestRPdu#pad2}*/
-public ActionRequestRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link ActionRequestRPdu#requestID}*/
-public ActionRequestRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link ActionRequestRPdu#actionID}*/
-public ActionRequestRPdu setActionID(ActionRequestActionID pActionID)
-{
-    actionID = pActionID;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#actionID}*/
-public ActionRequestActionID getActionID()
-{
-    return actionID; 
-}
-
-/** Setter for {@link ActionRequestRPdu#fixedDatumRecords}*/
-public ActionRequestRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
-{
-    fixedDatumRecords = pFixedDatumRecords;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
-{
-    return fixedDatumRecords; 
-}
-
-/** Setter for {@link ActionRequestRPdu#variableDatumRecords}*/
-public ActionRequestRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(requestID);
-       actionID.marshal(dos);
-       dos.writeInt(fixedDatumRecords.size());
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-        actionID = ActionRequestActionID.unmarshalEnum(dis);
-        uPosition += actionID.getMarshalledSize();
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumRecords.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)requestID);
-   actionID.marshal(buff);
-   buff.putInt( (int)fixedDatumRecords.size());
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    actionID = ActionRequestActionID.unmarshalEnum(buff);
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumRecords.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ActionRequestRPdu rhs = (ActionRequestRPdu)obj;
-
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (actionID == rhs.actionID)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-        if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" actionID: ").append(actionID).append("\n");
-    sb.append(" fixedDatumRecords: ").append("\n");
-    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
deleted file mode 100644
index cfc15fd2ca30eac8f4a6e89a62c737510902d86a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a ActionRequestRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ActionRequestReliablePdu extends ActionRequestRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
deleted file mode 100644
index 8a7f696a563750d6612efa91b5dcda49f306ff70..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.8. When an entity receives an Action Request PDU, that entity shall acknowledge the receipt of the Action Request PDU with an Action Response PDU. See 5.6.5.8.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ActionResponsePdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** Request ID that is unique */
-   protected int  requestID;
-
-   /** Status of response uid 72 */
-   protected ActionResponseRequestStatus requestStatus = ActionResponseRequestStatus.values()[0];
-
-   /** Number of fixed datum records */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** fixed length list of fixed datums */
-   protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
- 
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public ActionResponsePdu()
- {
-    setPduType( DISPDUType.ACTION_RESPONSE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += requestStatus.getMarshalledSize();
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ActionResponsePdu#requestID}*/
-public ActionResponsePdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link ActionResponsePdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link ActionResponsePdu#requestStatus}*/
-public ActionResponsePdu setRequestStatus(ActionResponseRequestStatus pRequestStatus)
-{
-    requestStatus = pRequestStatus;
-    return this;
-}
-
-/** Getter for {@link ActionResponsePdu#requestStatus}*/
-public ActionResponseRequestStatus getRequestStatus()
-{
-    return requestStatus; 
-}
-
-/** Setter for {@link ActionResponsePdu#fixedDatums}*/
-public ActionResponsePdu setFixedDatums(List<FixedDatum> pFixedDatums)
-{
-    fixedDatums = pFixedDatums;
-    return this;
-}
-
-/** Getter for {@link ActionResponsePdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
-{
-    return fixedDatums; 
-}
-
-/** Setter for {@link ActionResponsePdu#variableDatums}*/
-public ActionResponsePdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link ActionResponsePdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       requestStatus.marshal(dos);
-       dos.writeInt(fixedDatums.size());
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < fixedDatums.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatums.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        requestStatus = ActionResponseRequestStatus.unmarshalEnum(dis);
-        uPosition += requestStatus.getMarshalledSize();
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatums.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   requestStatus.marshal(buff);
-   buff.putInt( (int)fixedDatums.size());
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatums.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    requestStatus = ActionResponseRequestStatus.unmarshalEnum(buff);
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatums.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ActionResponsePdu rhs = (ActionResponsePdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (requestStatus == rhs.requestStatus)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatums.size(); idx++)
-        if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" requestStatus: ").append(requestStatus).append("\n");
-    sb.append(" fixedDatums: ").append("\n");
-    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
deleted file mode 100644
index 9e21b8c613e320158e85e286eadd29f632a56d2e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.8 Serves the same function as the Action Response PDU (see 5.6.5.8.1) but is used to acknowledge the receipt of an Action Request-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ActionResponseRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** request ID */
-   protected int  requestID;
-
-   /** status of response uid 72 */
-   protected ActionResponseRequestStatus responseStatus = ActionResponseRequestStatus.values()[0];
-
-   /** Fixed datum record count */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Fixed datum records */
-   protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
- 
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public ActionResponseRPdu()
- {
-    setPduType( DISPDUType.ACTION_RESPONSE_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += responseStatus.getMarshalledSize();
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ActionResponseRPdu#requestID}*/
-public ActionResponseRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link ActionResponseRPdu#responseStatus}*/
-public ActionResponseRPdu setResponseStatus(ActionResponseRequestStatus pResponseStatus)
-{
-    responseStatus = pResponseStatus;
-    return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#responseStatus}*/
-public ActionResponseRequestStatus getResponseStatus()
-{
-    return responseStatus; 
-}
-
-/** Setter for {@link ActionResponseRPdu#fixedDatumRecords}*/
-public ActionResponseRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
-{
-    fixedDatumRecords = pFixedDatumRecords;
-    return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
-{
-    return fixedDatumRecords; 
-}
-
-/** Setter for {@link ActionResponseRPdu#variableDatumRecords}*/
-public ActionResponseRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       responseStatus.marshal(dos);
-       dos.writeInt(fixedDatumRecords.size());
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        responseStatus = ActionResponseRequestStatus.unmarshalEnum(dis);
-        uPosition += responseStatus.getMarshalledSize();
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumRecords.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   responseStatus.marshal(buff);
-   buff.putInt( (int)fixedDatumRecords.size());
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    responseStatus = ActionResponseRequestStatus.unmarshalEnum(buff);
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumRecords.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ActionResponseRPdu rhs = (ActionResponseRPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (responseStatus == rhs.responseStatus)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-        if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" responseStatus: ").append(responseStatus).append("\n");
-    sb.append(" fixedDatumRecords: ").append("\n");
-    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
deleted file mode 100644
index 7ba70b38c8a36107bc2302cfd8312fc5e1f383c6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a ActionResponseRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ActionResponseReliablePdu extends ActionResponseRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
deleted file mode 100644
index cc77159d47aa92d95be3742086c611d41d8fd118..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of each aggregate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AggregateIdentifier extends Object implements Serializable
-{
-   /** Simulation address, ie site and application, the first two fields of the entity ID */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /** the aggregate ID */
-   protected short  aggregateID;
-
-
-/** Constructor */
- public AggregateIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // aggregateID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AggregateIdentifier#simulationAddress}*/
-public AggregateIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link AggregateIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link AggregateIdentifier#aggregateID}*/
-public AggregateIdentifier setAggregateID(short pAggregateID)
-{
-    aggregateID = pAggregateID;
-    return this;
-}
-
-/** Getter for {@link AggregateIdentifier#aggregateID}*/
-public short getAggregateID()
-{
-    return aggregateID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(aggregateID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        aggregateID = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)aggregateID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    aggregateID = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AggregateIdentifier rhs = (AggregateIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (aggregateID == rhs.aggregateID)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" aggregateID: ").append(aggregateID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateMarking.java b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
deleted file mode 100644
index 26074429bfc5521a50b37cbb2bbbaede9234230f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AggregateMarking.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4. 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AggregateMarking extends Object implements Serializable
-{
-   /** The character set uid 45 */
-   protected EntityMarkingCharacterSet characterSet = EntityMarkingCharacterSet.values()[0];
-
-   /** The characters */
-   protected byte[]  characters = new byte[31]; 
-
-
-/** Constructor */
- public AggregateMarking()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += characterSet.getMarshalledSize();
-   marshalSize += characters.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AggregateMarking#characterSet}*/
-public AggregateMarking setCharacterSet(EntityMarkingCharacterSet pCharacterSet)
-{
-    characterSet = pCharacterSet;
-    return this;
-}
-
-/** Getter for {@link AggregateMarking#characterSet}*/
-public EntityMarkingCharacterSet getCharacterSet()
-{
-    return characterSet; 
-}
-
-/** Setter for {@link AggregateMarking#characters}*/
-public AggregateMarking setCharacters(byte[] pCharacters)
-{
-    characters = pCharacters;
-    return this;
-}
-
-/** Getter for {@link AggregateMarking#characters}*/
-public byte[] getCharacters()
-{
-    return characters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       characterSet.marshal(dos);
-
-       for(int idx = 0; idx < characters.length; idx++)
-           dos.writeByte(characters[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        characterSet = EntityMarkingCharacterSet.unmarshalEnum(dis);
-        uPosition += characterSet.getMarshalledSize();
-        for(int idx = 0; idx < characters.length; idx++)
-            characters[idx] = dis.readByte();
-        uPosition += (characters.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   characterSet.marshal(buff);
-
-   for(int idx = 0; idx < characters.length; idx++)
-       buff.put((byte)characters[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    characterSet = EntityMarkingCharacterSet.unmarshalEnum(buff);
-    for(int idx = 0; idx < characters.length; idx++)
-        characters[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AggregateMarking rhs = (AggregateMarking)obj;
-
-     if( ! (characterSet == rhs.characterSet)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 31; idx++)
-     {
-          if(!(characters[idx] == rhs.characters[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" characterSet: ").append(characterSet).append("\n");
-    sb.append(" characters: ").append("\n");
-    sb.append(Arrays.toString(characters)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
deleted file mode 100644
index c560c568103bc14386d2f07aa9e6ec58459eb405..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
+++ /dev/null
@@ -1,706 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.9.2.2 The Aggregate State PDU shall be used to communicate the state and other pertinent information about an aggregated unit.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AggregateStatePdu extends EntityManagementFamilyPdu implements Serializable
-{
-   /** ID of aggregated entities */
-   protected AggregateIdentifier  aggregateID = new AggregateIdentifier(); 
-
-   /** force ID uid 6 */
-   protected ForceID forceID = ForceID.values()[0];
-
-   /** state of aggregate uid 204 */
-   protected AggregateStateAggregateState aggregateState = AggregateStateAggregateState.values()[0];
-
-   /** entity type of the aggregated entities */
-   protected AggregateType  aggregateType = new AggregateType(); 
-
-   /** formation of aggregated entities uid 205 */
-   protected AggregateStateFormation formation = AggregateStateFormation.values()[0];
-
-   /** marking for aggregate; first char is charset type, rest is char data */
-   protected AggregateMarking  aggregateMarking = new AggregateMarking(); 
-
-   /** dimensions of bounding box for the aggregated entities, origin at the center of mass */
-   protected Vector3Float  dimensions = new Vector3Float(); 
-
-   /** orientation of the bounding box */
-   protected Vector3Float  orientation = new Vector3Float(); 
-
-   /** center of mass of the aggregation */
-   protected Vector3Double  centerOfMass = new Vector3Double(); 
-
-   /** velocity of aggregation */
-   protected Vector3Float  velocity = new Vector3Float(); 
-
-   /** number of aggregates */
-   protected short  numberOfDisAggregates;
-
-   /** number of entities */
-   protected short  numberOfDisEntities;
-
-   /** number of silent aggregate types */
-   protected short  numberOfSilentAggregateTypes;
-
-   /** Number of silent entity types, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected short  numberOfSilentEntityTypes;
-
-   /** aggregates  list */
-   protected List< AggregateIdentifier > aggregateIDList = new ArrayList< AggregateIdentifier >();
- 
-   /** entity ID list */
-   protected List< EntityID > entityIDList = new ArrayList< EntityID >();
- 
-   private byte[] padTo32 = new byte[0]; // pad to 32-bit boundary
-
-   /** silent entity types */
-   protected List< EntityType > silentAggregateSystemList = new ArrayList< EntityType >();
- 
-   /** silent entity types */
-   protected List< EntityType > silentEntitySystemList = new ArrayList< EntityType >();
- 
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variableDatums */
-   protected List< VariableDatum > variableDatumList = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public AggregateStatePdu()
- {
-    setPduType( DISPDUType.AGGREGATE_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += aggregateID.getMarshalledSize();
-   marshalSize += forceID.getMarshalledSize();
-   marshalSize += aggregateState.getMarshalledSize();
-   marshalSize += aggregateType.getMarshalledSize();
-   marshalSize += formation.getMarshalledSize();
-   marshalSize += aggregateMarking.getMarshalledSize();
-   marshalSize += dimensions.getMarshalledSize();
-   marshalSize += orientation.getMarshalledSize();
-   marshalSize += centerOfMass.getMarshalledSize();
-   marshalSize += velocity.getMarshalledSize();
-   marshalSize += 2;  // numberOfDisAggregates
-   marshalSize += 2;  // numberOfDisEntities
-   marshalSize += 2;  // numberOfSilentAggregateTypes
-   marshalSize += 2;  // numberOfSilentEntityTypes
-   for(int idx=0; idx < aggregateIDList.size(); idx++)
-   {
-        AggregateIdentifier listElement = aggregateIDList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < entityIDList.size(); idx++)
-   {
-        EntityID listElement = entityIDList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += padTo32.length;
-   for(int idx=0; idx < silentAggregateSystemList.size(); idx++)
-   {
-        EntityType listElement = silentAggregateSystemList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < silentEntitySystemList.size(); idx++)
-   {
-        EntityType listElement = silentEntitySystemList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < variableDatumList.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AggregateStatePdu#aggregateID}*/
-public AggregateStatePdu setAggregateID(AggregateIdentifier pAggregateID)
-{
-    aggregateID = pAggregateID;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateID}*/
-public AggregateIdentifier getAggregateID()
-{
-    return aggregateID; 
-}
-
-/** Setter for {@link AggregateStatePdu#forceID}*/
-public AggregateStatePdu setForceID(ForceID pForceID)
-{
-    forceID = pForceID;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#forceID}*/
-public ForceID getForceID()
-{
-    return forceID; 
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateState}*/
-public AggregateStatePdu setAggregateState(AggregateStateAggregateState pAggregateState)
-{
-    aggregateState = pAggregateState;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateState}*/
-public AggregateStateAggregateState getAggregateState()
-{
-    return aggregateState; 
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateType}*/
-public AggregateStatePdu setAggregateType(AggregateType pAggregateType)
-{
-    aggregateType = pAggregateType;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateType}*/
-public AggregateType getAggregateType()
-{
-    return aggregateType; 
-}
-
-/** Setter for {@link AggregateStatePdu#formation}*/
-public AggregateStatePdu setFormation(AggregateStateFormation pFormation)
-{
-    formation = pFormation;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#formation}*/
-public AggregateStateFormation getFormation()
-{
-    return formation; 
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateMarking}*/
-public AggregateStatePdu setAggregateMarking(AggregateMarking pAggregateMarking)
-{
-    aggregateMarking = pAggregateMarking;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateMarking}*/
-public AggregateMarking getAggregateMarking()
-{
-    return aggregateMarking; 
-}
-
-/** Setter for {@link AggregateStatePdu#dimensions}*/
-public AggregateStatePdu setDimensions(Vector3Float pDimensions)
-{
-    dimensions = pDimensions;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#dimensions}*/
-public Vector3Float getDimensions()
-{
-    return dimensions; 
-}
-
-/** Setter for {@link AggregateStatePdu#orientation}*/
-public AggregateStatePdu setOrientation(Vector3Float pOrientation)
-{
-    orientation = pOrientation;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#orientation}*/
-public Vector3Float getOrientation()
-{
-    return orientation; 
-}
-
-/** Setter for {@link AggregateStatePdu#centerOfMass}*/
-public AggregateStatePdu setCenterOfMass(Vector3Double pCenterOfMass)
-{
-    centerOfMass = pCenterOfMass;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#centerOfMass}*/
-public Vector3Double getCenterOfMass()
-{
-    return centerOfMass; 
-}
-
-/** Setter for {@link AggregateStatePdu#velocity}*/
-public AggregateStatePdu setVelocity(Vector3Float pVelocity)
-{
-    velocity = pVelocity;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#velocity}*/
-public Vector3Float getVelocity()
-{
-    return velocity; 
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateIDList}*/
-public AggregateStatePdu setAggregateIDList(List<AggregateIdentifier> pAggregateIDList)
-{
-    aggregateIDList = pAggregateIDList;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateIDList}*/
-public List<AggregateIdentifier> getAggregateIDList()
-{
-    return aggregateIDList; 
-}
-
-/** Setter for {@link AggregateStatePdu#entityIDList}*/
-public AggregateStatePdu setEntityIDList(List<EntityID> pEntityIDList)
-{
-    entityIDList = pEntityIDList;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#entityIDList}*/
-public List<EntityID> getEntityIDList()
-{
-    return entityIDList; 
-}
-
-/** Setter for {@link AggregateStatePdu#silentAggregateSystemList}*/
-public AggregateStatePdu setSilentAggregateSystemList(List<EntityType> pSilentAggregateSystemList)
-{
-    silentAggregateSystemList = pSilentAggregateSystemList;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#silentAggregateSystemList}*/
-public List<EntityType> getSilentAggregateSystemList()
-{
-    return silentAggregateSystemList; 
-}
-
-/** Setter for {@link AggregateStatePdu#silentEntitySystemList}*/
-public AggregateStatePdu setSilentEntitySystemList(List<EntityType> pSilentEntitySystemList)
-{
-    silentEntitySystemList = pSilentEntitySystemList;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#silentEntitySystemList}*/
-public List<EntityType> getSilentEntitySystemList()
-{
-    return silentEntitySystemList; 
-}
-
-/** Setter for {@link AggregateStatePdu#variableDatumList}*/
-public AggregateStatePdu setVariableDatumList(List<VariableDatum> pVariableDatumList)
-{
-    variableDatumList = pVariableDatumList;
-    return this;
-}
-
-/** Getter for {@link AggregateStatePdu#variableDatumList}*/
-public List<VariableDatum> getVariableDatumList()
-{
-    return variableDatumList; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       aggregateID.marshal(dos);
-       forceID.marshal(dos);
-       aggregateState.marshal(dos);
-       aggregateType.marshal(dos);
-       formation.marshal(dos);
-       aggregateMarking.marshal(dos);
-       dimensions.marshal(dos);
-       orientation.marshal(dos);
-       centerOfMass.marshal(dos);
-       velocity.marshal(dos);
-       dos.writeShort(aggregateIDList.size());
-       dos.writeShort(entityIDList.size());
-       dos.writeShort(silentAggregateSystemList.size());
-       dos.writeShort(silentEntitySystemList.size());
-
-       for(int idx = 0; idx < aggregateIDList.size(); idx++)
-       {
-            AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
-            aAggregateIdentifier.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < entityIDList.size(); idx++)
-       {
-            EntityID aEntityID = entityIDList.get(idx);
-            aEntityID.marshal(dos);
-       }
-
-       padTo32 = new byte[Align.to32bits(dos)];
-
-       for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
-       {
-            EntityType aEntityType = silentAggregateSystemList.get(idx);
-            aEntityType.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
-       {
-            EntityType aEntityType = silentEntitySystemList.get(idx);
-            aEntityType.marshal(dos);
-       }
-
-       dos.writeInt(variableDatumList.size());
-
-       for(int idx = 0; idx < variableDatumList.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumList.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += aggregateID.unmarshal(dis);
-        forceID = ForceID.unmarshalEnum(dis);
-        uPosition += forceID.getMarshalledSize();
-        aggregateState = AggregateStateAggregateState.unmarshalEnum(dis);
-        uPosition += aggregateState.getMarshalledSize();
-        uPosition += aggregateType.unmarshal(dis);
-        formation = AggregateStateFormation.unmarshalEnum(dis);
-        uPosition += formation.getMarshalledSize();
-        uPosition += aggregateMarking.unmarshal(dis);
-        uPosition += dimensions.unmarshal(dis);
-        uPosition += orientation.unmarshal(dis);
-        uPosition += centerOfMass.unmarshal(dis);
-        uPosition += velocity.unmarshal(dis);
-        numberOfDisAggregates = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfDisEntities = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfSilentAggregateTypes = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfSilentEntityTypes = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfDisAggregates; idx++)
-        {
-            AggregateIdentifier anX = new AggregateIdentifier();
-            uPosition += anX.unmarshal(dis);
-            aggregateIDList.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfDisEntities; idx++)
-        {
-            EntityID anX = new EntityID();
-            uPosition += anX.unmarshal(dis);
-            entityIDList.add(anX);
-        }
-
-        padTo32 = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padTo32.length;
-        for(int idx = 0; idx < numberOfSilentAggregateTypes; idx++)
-        {
-            EntityType anX = new EntityType();
-            uPosition += anX.unmarshal(dis);
-            silentAggregateSystemList.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfSilentEntityTypes; idx++)
-        {
-            EntityType anX = new EntityType();
-            uPosition += anX.unmarshal(dis);
-            silentEntitySystemList.add(anX);
-        }
-
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumList.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   aggregateID.marshal(buff);
-   forceID.marshal(buff);
-   aggregateState.marshal(buff);
-   aggregateType.marshal(buff);
-   formation.marshal(buff);
-   aggregateMarking.marshal(buff);
-   dimensions.marshal(buff);
-   orientation.marshal(buff);
-   centerOfMass.marshal(buff);
-   velocity.marshal(buff);
-   buff.putShort( (short)aggregateIDList.size());
-   buff.putShort( (short)entityIDList.size());
-   buff.putShort( (short)silentAggregateSystemList.size());
-   buff.putShort( (short)silentEntitySystemList.size());
-
-   for(int idx = 0; idx < aggregateIDList.size(); idx++)
-   {
-        AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
-        aAggregateIdentifier.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < entityIDList.size(); idx++)
-   {
-        EntityID aEntityID = entityIDList.get(idx);
-        aEntityID.marshal(buff);
-   }
-
-   padTo32 = new byte[Align.to32bits(buff)];
-
-   for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
-   {
-        EntityType aEntityType = silentAggregateSystemList.get(idx);
-        aEntityType.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
-   {
-        EntityType aEntityType = silentEntitySystemList.get(idx);
-        aEntityType.marshal(buff);
-   }
-
-   buff.putInt( (int)variableDatumList.size());
-
-   for(int idx = 0; idx < variableDatumList.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumList.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    aggregateID.unmarshal(buff);
-    forceID = ForceID.unmarshalEnum(buff);
-    aggregateState = AggregateStateAggregateState.unmarshalEnum(buff);
-    aggregateType.unmarshal(buff);
-    formation = AggregateStateFormation.unmarshalEnum(buff);
-    aggregateMarking.unmarshal(buff);
-    dimensions.unmarshal(buff);
-    orientation.unmarshal(buff);
-    centerOfMass.unmarshal(buff);
-    velocity.unmarshal(buff);
-    numberOfDisAggregates = (short)(buff.getShort() & 0xFFFF);
-    numberOfDisEntities = (short)(buff.getShort() & 0xFFFF);
-    numberOfSilentAggregateTypes = (short)(buff.getShort() & 0xFFFF);
-    numberOfSilentEntityTypes = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfDisAggregates; idx++)
-    {
-    AggregateIdentifier anX = new AggregateIdentifier();
-    anX.unmarshal(buff);
-    aggregateIDList.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfDisEntities; idx++)
-    {
-    EntityID anX = new EntityID();
-    anX.unmarshal(buff);
-    entityIDList.add(anX);
-    }
-
-    padTo32 = new byte[Align.from32bits(buff)];
-    for(int idx = 0; idx < numberOfSilentAggregateTypes; idx++)
-    {
-    EntityType anX = new EntityType();
-    anX.unmarshal(buff);
-    silentAggregateSystemList.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfSilentEntityTypes; idx++)
-    {
-    EntityType anX = new EntityType();
-    anX.unmarshal(buff);
-    silentEntitySystemList.add(anX);
-    }
-
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumList.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AggregateStatePdu rhs = (AggregateStatePdu)obj;
-
-     if( ! (aggregateID.equals( rhs.aggregateID) )) ivarsEqual = false;
-     if( ! (forceID == rhs.forceID)) ivarsEqual = false;
-     if( ! (aggregateState == rhs.aggregateState)) ivarsEqual = false;
-     if( ! (aggregateType.equals( rhs.aggregateType) )) ivarsEqual = false;
-     if( ! (formation == rhs.formation)) ivarsEqual = false;
-     if( ! (aggregateMarking.equals( rhs.aggregateMarking) )) ivarsEqual = false;
-     if( ! (dimensions.equals( rhs.dimensions) )) ivarsEqual = false;
-     if( ! (orientation.equals( rhs.orientation) )) ivarsEqual = false;
-     if( ! (centerOfMass.equals( rhs.centerOfMass) )) ivarsEqual = false;
-     if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < aggregateIDList.size(); idx++)
-        if( ! ( aggregateIDList.get(idx).equals(rhs.aggregateIDList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < entityIDList.size(); idx++)
-        if( ! ( entityIDList.get(idx).equals(rhs.entityIDList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
-        if( ! ( silentAggregateSystemList.get(idx).equals(rhs.silentAggregateSystemList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
-        if( ! ( silentEntitySystemList.get(idx).equals(rhs.silentEntitySystemList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumList.size(); idx++)
-        if( ! ( variableDatumList.get(idx).equals(rhs.variableDatumList.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" aggregateID: ").append(aggregateID).append("\n");
-    sb.append(" forceID: ").append(forceID).append("\n");
-    sb.append(" aggregateState: ").append(aggregateState).append("\n");
-    sb.append(" aggregateType: ").append(aggregateType).append("\n");
-    sb.append(" formation: ").append(formation).append("\n");
-    sb.append(" aggregateMarking: ").append(aggregateMarking).append("\n");
-    sb.append(" dimensions: ").append(dimensions).append("\n");
-    sb.append(" orientation: ").append(orientation).append("\n");
-    sb.append(" centerOfMass: ").append(centerOfMass).append("\n");
-    sb.append(" velocity: ").append(velocity).append("\n");
-    sb.append(" padTo32: ").append(padTo32).append("\n");
-    sb.append(" aggregateIDList: ").append("\n");
-    aggregateIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" entityIDList: ").append("\n");
-    entityIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" silentAggregateSystemList: ").append("\n");
-    silentAggregateSystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" silentEntitySystemList: ").append("\n");
-    silentEntitySystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumList: ").append("\n");
-    variableDatumList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateType.java b/src-generated/edu/nps/moves/dis7/AggregateType.java
deleted file mode 100644
index ff914dad8843a058714bd3d085d483e0cf93b9c9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AggregateType.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type and organization of an aggregate. Section 6.2.5
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AggregateType extends Object implements Serializable
-{
-   /** Grouping criterion used to group the aggregate. Enumeration from EBV document uid 206 */
-   protected AggregateStateAggregateKind aggregateKind = AggregateStateAggregateKind.values()[0];
-
-   /** Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply. uid 8 */
-   protected PlatformDomain domain = PlatformDomain.values()[0];
-
-   /** country to which the design of the entity is attributed uid 29 */
-   protected Country country = Country.values()[0];
-
-   /** category of entity */
-   protected byte  category;
-
-   /** subcategory of entity uid 208 */
-   protected AggregateStateSubcategory subcategory = AggregateStateSubcategory.values()[0];
-
-   /** specific info based on subcategory field. specific is a reserved word in sql. uid 209 */
-   protected AggregateStateSpecific specificInfo = AggregateStateSpecific.values()[0];
-
-   protected byte  extra;
-
-
-/** Constructor */
- public AggregateType()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += aggregateKind.getMarshalledSize();
-   marshalSize += domain.getMarshalledSize();
-   marshalSize += country.getMarshalledSize();
-   marshalSize += 1;  // category
-   marshalSize += subcategory.getMarshalledSize();
-   marshalSize += specificInfo.getMarshalledSize();
-   marshalSize += 1;  // extra
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AggregateType#aggregateKind}*/
-public AggregateType setAggregateKind(AggregateStateAggregateKind pAggregateKind)
-{
-    aggregateKind = pAggregateKind;
-    return this;
-}
-
-/** Getter for {@link AggregateType#aggregateKind}*/
-public AggregateStateAggregateKind getAggregateKind()
-{
-    return aggregateKind; 
-}
-
-/** Setter for {@link AggregateType#domain}*/
-public AggregateType setDomain(PlatformDomain pDomain)
-{
-    domain = pDomain;
-    return this;
-}
-
-/** Getter for {@link AggregateType#domain}*/
-public PlatformDomain getDomain()
-{
-    return domain; 
-}
-
-/** Setter for {@link AggregateType#country}*/
-public AggregateType setCountry(Country pCountry)
-{
-    country = pCountry;
-    return this;
-}
-
-/** Getter for {@link AggregateType#country}*/
-public Country getCountry()
-{
-    return country; 
-}
-
-/** Setter for {@link AggregateType#category}*/
-public AggregateType setCategory(byte pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link AggregateType#category}*/
-public byte getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link AggregateType#subcategory}*/
-public AggregateType setSubcategory(AggregateStateSubcategory pSubcategory)
-{
-    subcategory = pSubcategory;
-    return this;
-}
-
-/** Getter for {@link AggregateType#subcategory}*/
-public AggregateStateSubcategory getSubcategory()
-{
-    return subcategory; 
-}
-
-/** Setter for {@link AggregateType#specificInfo}*/
-public AggregateType setSpecificInfo(AggregateStateSpecific pSpecificInfo)
-{
-    specificInfo = pSpecificInfo;
-    return this;
-}
-
-/** Getter for {@link AggregateType#specificInfo}*/
-public AggregateStateSpecific getSpecificInfo()
-{
-    return specificInfo; 
-}
-
-/** Setter for {@link AggregateType#extra}*/
-public AggregateType setExtra(byte pExtra)
-{
-    extra = pExtra;
-    return this;
-}
-
-/** Getter for {@link AggregateType#extra}*/
-public byte getExtra()
-{
-    return extra; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       aggregateKind.marshal(dos);
-       domain.marshal(dos);
-       country.marshal(dos);
-       dos.writeByte(category);
-       subcategory.marshal(dos);
-       specificInfo.marshal(dos);
-       dos.writeByte(extra);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        aggregateKind = AggregateStateAggregateKind.unmarshalEnum(dis);
-        uPosition += aggregateKind.getMarshalledSize();
-        domain = PlatformDomain.unmarshalEnum(dis);
-        uPosition += domain.getMarshalledSize();
-        country = Country.unmarshalEnum(dis);
-        uPosition += country.getMarshalledSize();
-        category = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        subcategory = AggregateStateSubcategory.unmarshalEnum(dis);
-        uPosition += subcategory.getMarshalledSize();
-        specificInfo = AggregateStateSpecific.unmarshalEnum(dis);
-        uPosition += specificInfo.getMarshalledSize();
-        extra = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   aggregateKind.marshal(buff);
-   domain.marshal(buff);
-   country.marshal(buff);
-   buff.put( (byte)category);
-   subcategory.marshal(buff);
-   specificInfo.marshal(buff);
-   buff.put( (byte)extra);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    aggregateKind = AggregateStateAggregateKind.unmarshalEnum(buff);
-    domain = PlatformDomain.unmarshalEnum(buff);
-    country = Country.unmarshalEnum(buff);
-    category = (byte)(buff.get() & 0xFF);
-    subcategory = AggregateStateSubcategory.unmarshalEnum(buff);
-    specificInfo = AggregateStateSpecific.unmarshalEnum(buff);
-    extra = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AggregateType rhs = (AggregateType)obj;
-
-     if( ! (aggregateKind == rhs.aggregateKind)) ivarsEqual = false;
-     if( ! (domain == rhs.domain)) ivarsEqual = false;
-     if( ! (country == rhs.country)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
-     if( ! (specificInfo == rhs.specificInfo)) ivarsEqual = false;
-     if( ! (extra == rhs.extra)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" aggregateKind: ").append(aggregateKind).append("\n");
-    sb.append(" domain: ").append(domain).append("\n");
-    sb.append(" country: ").append(country).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subcategory: ").append(subcategory).append("\n");
-    sb.append(" specificInfo: ").append(specificInfo).append("\n");
-    sb.append(" extra: ").append(extra).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Align.java b/src-generated/edu/nps/moves/dis7/Align.java
deleted file mode 100644
index c02ff5463ce1d3d4a6ccf339b7f89bc4dc84cc11..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Align.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-/**
- * Align.java created on Jul 15, 2019
- * A class with methods to marshal and unmarshal variable length padding
- *
- * @author Mike Bailey, jmbailey@nps.edu
- * @version $Id$
- */
-public class Align
-{
-  static public int to16bits(ByteBuffer buff)
-  {
-      int pad = (2 - buff.position() % 2) % 2;
-      Arrays.stream(new int[pad]).forEach(x->buff.put((byte)0));
-      return pad;
-  }
-  
-  static public int to16bits(DataOutputStream dos)
-  {
-      int pad = (2 - dos.size() % 2) % 2;
-      Arrays.stream(new int[pad]).forEach(x->dosWrite(dos));
-      return pad;
-  }
-  
-  static public int to32bits(ByteBuffer buff)
-  {
-      int pad = (4 - buff.position() % 4) % 4;
-      Arrays.stream(new int[pad]).forEach(x->buff.put((byte)0));
-      return pad;
-  }
-  
-  static public int to32bits(DataOutputStream dos)
-  {
-      int pad = (4 - dos.size() % 4) % 4;
-      Arrays.stream(new int[pad]).forEach(x->dosWrite(dos));
-      return pad;
-  }
-  
-  static public int to64bits(ByteBuffer buff)
-  {
-      int pad = (8 - buff.position() % 8) % 8;
-      Arrays.stream(new int[pad]).forEach(x->buff.put((byte)0));
-      return pad;
-  }
-  
-  static public int to64bits(DataOutputStream dos)
-  {
-      int pad = (8 - dos.size() % 8) % 8;
-      Arrays.stream(new int[pad]).forEach(x->dosWrite(dos));
-      return pad;
-  }
-  
-  /********* Unmarshaling **************/
-  static public int from16bits(ByteBuffer buff)
-  {
-      int pad = (2 - buff.position() % 2) % 2;
-      Arrays.stream(new int[pad]).forEach(x->buff.get());
-      return pad;
-  }
-  
-  static public int from16bits(int position, DataInputStream dis)
-  {
-      int pad = (2 - position % 2) % 2;
-      Arrays.stream(new int[pad]).forEach(x->disRead(dis));
-      return pad;
-  }
-  
-  static public int from32bits(ByteBuffer buff)
-  {
-      int pad = (4 - buff.position() % 4) % 4;
-      Arrays.stream(new int[pad]).forEach(x->buff.get());
-      return pad;
-  }
-  
-  static public int from32bits(int position, DataInputStream dis)
-  {
-      int pad = (4 - position % 4) % 4;
-      Arrays.stream(new int[pad]).forEach(x->disRead(dis));
-      return pad;
-  }
-  
-  static public int from64bits(ByteBuffer buff)
-  {
-      int pad = (8 - buff.position() % 8) % 8;
-      Arrays.stream(new int[pad]).forEach(x->buff.get());
-      return pad;
-  }
-  
-  static public int from64bits(int position, DataInputStream dis)
-  {
-      int pad = (8 - position % 8) % 8;
-      Arrays.stream(new int[pad]).forEach(x->disRead(dis));
-      return pad;
-  }
-
-  static private void disRead(DataInputStream dis)
-  {
-      try {
-          dis.read();
-      }
-      catch(IOException ex) {
-          ex.printStackTrace(System.err);
-          throw new RuntimeException("IOException ex: "+ex.getLocalizedMessage());
-      }
-  }
-  
-  static private void dosWrite(DataOutputStream dos)
-  {
-     try {
-          dos.writeByte(0);
-      }
-      catch(IOException ex) {
-          ex.printStackTrace(System.err);
-          throw new RuntimeException("IOException ex: "+ex.getLocalizedMessage());
-      }
-      
-  }
-}
diff --git a/src-generated/edu/nps/moves/dis7/AngleDeception.java b/src-generated/edu/nps/moves/dis7/AngleDeception.java
deleted file mode 100644
index d7f255b0202490ad28f1c4dcca66843adc45b272..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AngleDeception.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.21.2.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AngleDeception extends Object implements Serializable
-{
-   protected int  recordType = (int)3501;
-
-   protected short  recordLength = (short)48;
-
-   protected short  padding = (short)0;
-
-   protected byte  emitterNumber;
-
-   protected byte  beamNumber;
-
-   /**  uid 300 */
-   protected EEAttributeStateIndicator stateIndicator = EEAttributeStateIndicator.values()[0];
-
-   protected byte  padding2 = (byte)0;
-
-   protected float  azimuthOffset;
-
-   protected float  azimuthWidth;
-
-   protected float  azimuthPullRate;
-
-   protected float  azimuthPullAcceleration;
-
-   protected float  elevationOffset;
-
-   protected float  elevationWidth;
-
-   protected float  elevationPullRate;
-
-   protected float  elevationPullAcceleration;
-
-   protected int  padding3 = (int)0;
-
-
-/** Constructor */
- public AngleDeception()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // padding
-   marshalSize += 1;  // emitterNumber
-   marshalSize += 1;  // beamNumber
-   marshalSize += stateIndicator.getMarshalledSize();
-   marshalSize += 1;  // padding2
-   marshalSize += 4;  // azimuthOffset
-   marshalSize += 4;  // azimuthWidth
-   marshalSize += 4;  // azimuthPullRate
-   marshalSize += 4;  // azimuthPullAcceleration
-   marshalSize += 4;  // elevationOffset
-   marshalSize += 4;  // elevationWidth
-   marshalSize += 4;  // elevationPullRate
-   marshalSize += 4;  // elevationPullAcceleration
-   marshalSize += 4;  // padding3
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AngleDeception#recordType}*/
-public AngleDeception setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link AngleDeception#recordLength}*/
-public AngleDeception setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link AngleDeception#padding}*/
-public AngleDeception setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link AngleDeception#emitterNumber}*/
-public AngleDeception setEmitterNumber(byte pEmitterNumber)
-{
-    emitterNumber = pEmitterNumber;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#emitterNumber}*/
-public byte getEmitterNumber()
-{
-    return emitterNumber; 
-}
-
-/** Setter for {@link AngleDeception#beamNumber}*/
-public AngleDeception setBeamNumber(byte pBeamNumber)
-{
-    beamNumber = pBeamNumber;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#beamNumber}*/
-public byte getBeamNumber()
-{
-    return beamNumber; 
-}
-
-/** Setter for {@link AngleDeception#stateIndicator}*/
-public AngleDeception setStateIndicator(EEAttributeStateIndicator pStateIndicator)
-{
-    stateIndicator = pStateIndicator;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#stateIndicator}*/
-public EEAttributeStateIndicator getStateIndicator()
-{
-    return stateIndicator; 
-}
-
-/** Setter for {@link AngleDeception#padding2}*/
-public AngleDeception setPadding2(byte pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#padding2}*/
-public byte getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link AngleDeception#azimuthOffset}*/
-public AngleDeception setAzimuthOffset(float pAzimuthOffset)
-{
-    azimuthOffset = pAzimuthOffset;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthOffset}*/
-public float getAzimuthOffset()
-{
-    return azimuthOffset; 
-}
-
-/** Setter for {@link AngleDeception#azimuthWidth}*/
-public AngleDeception setAzimuthWidth(float pAzimuthWidth)
-{
-    azimuthWidth = pAzimuthWidth;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthWidth}*/
-public float getAzimuthWidth()
-{
-    return azimuthWidth; 
-}
-
-/** Setter for {@link AngleDeception#azimuthPullRate}*/
-public AngleDeception setAzimuthPullRate(float pAzimuthPullRate)
-{
-    azimuthPullRate = pAzimuthPullRate;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthPullRate}*/
-public float getAzimuthPullRate()
-{
-    return azimuthPullRate; 
-}
-
-/** Setter for {@link AngleDeception#azimuthPullAcceleration}*/
-public AngleDeception setAzimuthPullAcceleration(float pAzimuthPullAcceleration)
-{
-    azimuthPullAcceleration = pAzimuthPullAcceleration;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthPullAcceleration}*/
-public float getAzimuthPullAcceleration()
-{
-    return azimuthPullAcceleration; 
-}
-
-/** Setter for {@link AngleDeception#elevationOffset}*/
-public AngleDeception setElevationOffset(float pElevationOffset)
-{
-    elevationOffset = pElevationOffset;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#elevationOffset}*/
-public float getElevationOffset()
-{
-    return elevationOffset; 
-}
-
-/** Setter for {@link AngleDeception#elevationWidth}*/
-public AngleDeception setElevationWidth(float pElevationWidth)
-{
-    elevationWidth = pElevationWidth;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#elevationWidth}*/
-public float getElevationWidth()
-{
-    return elevationWidth; 
-}
-
-/** Setter for {@link AngleDeception#elevationPullRate}*/
-public AngleDeception setElevationPullRate(float pElevationPullRate)
-{
-    elevationPullRate = pElevationPullRate;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#elevationPullRate}*/
-public float getElevationPullRate()
-{
-    return elevationPullRate; 
-}
-
-/** Setter for {@link AngleDeception#elevationPullAcceleration}*/
-public AngleDeception setElevationPullAcceleration(float pElevationPullAcceleration)
-{
-    elevationPullAcceleration = pElevationPullAcceleration;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#elevationPullAcceleration}*/
-public float getElevationPullAcceleration()
-{
-    return elevationPullAcceleration; 
-}
-
-/** Setter for {@link AngleDeception#padding3}*/
-public AngleDeception setPadding3(int pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link AngleDeception#padding3}*/
-public int getPadding3()
-{
-    return padding3; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordLength);
-       dos.writeShort(padding);
-       dos.writeByte(emitterNumber);
-       dos.writeByte(beamNumber);
-       stateIndicator.marshal(dos);
-       dos.writeByte(padding2);
-       dos.writeFloat(azimuthOffset);
-       dos.writeFloat(azimuthWidth);
-       dos.writeFloat(azimuthPullRate);
-       dos.writeFloat(azimuthPullAcceleration);
-       dos.writeFloat(elevationOffset);
-       dos.writeFloat(elevationWidth);
-       dos.writeFloat(elevationPullRate);
-       dos.writeFloat(elevationPullAcceleration);
-       dos.writeInt(padding3);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        emitterNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
-        uPosition += stateIndicator.getMarshalledSize();
-        padding2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        azimuthOffset = dis.readFloat();
-        uPosition += 4;
-        azimuthWidth = dis.readFloat();
-        uPosition += 4;
-        azimuthPullRate = dis.readFloat();
-        uPosition += 4;
-        azimuthPullAcceleration = dis.readFloat();
-        uPosition += 4;
-        elevationOffset = dis.readFloat();
-        uPosition += 4;
-        elevationWidth = dis.readFloat();
-        uPosition += 4;
-        elevationPullRate = dis.readFloat();
-        uPosition += 4;
-        elevationPullAcceleration = dis.readFloat();
-        uPosition += 4;
-        padding3 = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)padding);
-   buff.put( (byte)emitterNumber);
-   buff.put( (byte)beamNumber);
-   stateIndicator.marshal(buff);
-   buff.put( (byte)padding2);
-   buff.putFloat( (float)azimuthOffset);
-   buff.putFloat( (float)azimuthWidth);
-   buff.putFloat( (float)azimuthPullRate);
-   buff.putFloat( (float)azimuthPullAcceleration);
-   buff.putFloat( (float)elevationOffset);
-   buff.putFloat( (float)elevationWidth);
-   buff.putFloat( (float)elevationPullRate);
-   buff.putFloat( (float)elevationPullAcceleration);
-   buff.putInt( (int)padding3);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    emitterNumber = (byte)(buff.get() & 0xFF);
-    beamNumber = (byte)(buff.get() & 0xFF);
-    stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
-    padding2 = (byte)(buff.get() & 0xFF);
-    azimuthOffset = buff.getFloat();
-    azimuthWidth = buff.getFloat();
-    azimuthPullRate = buff.getFloat();
-    azimuthPullAcceleration = buff.getFloat();
-    elevationOffset = buff.getFloat();
-    elevationWidth = buff.getFloat();
-    elevationPullRate = buff.getFloat();
-    elevationPullAcceleration = buff.getFloat();
-    padding3 = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AngleDeception rhs = (AngleDeception)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
-     if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
-     if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (azimuthOffset == rhs.azimuthOffset)) ivarsEqual = false;
-     if( ! (azimuthWidth == rhs.azimuthWidth)) ivarsEqual = false;
-     if( ! (azimuthPullRate == rhs.azimuthPullRate)) ivarsEqual = false;
-     if( ! (azimuthPullAcceleration == rhs.azimuthPullAcceleration)) ivarsEqual = false;
-     if( ! (elevationOffset == rhs.elevationOffset)) ivarsEqual = false;
-     if( ! (elevationWidth == rhs.elevationWidth)) ivarsEqual = false;
-     if( ! (elevationPullRate == rhs.elevationPullRate)) ivarsEqual = false;
-     if( ! (elevationPullAcceleration == rhs.elevationPullAcceleration)) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
-    sb.append(" beamNumber: ").append(beamNumber).append("\n");
-    sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" azimuthOffset: ").append(azimuthOffset).append("\n");
-    sb.append(" azimuthWidth: ").append(azimuthWidth).append("\n");
-    sb.append(" azimuthPullRate: ").append(azimuthPullRate).append("\n");
-    sb.append(" azimuthPullAcceleration: ").append(azimuthPullAcceleration).append("\n");
-    sb.append(" elevationOffset: ").append(elevationOffset).append("\n");
-    sb.append(" elevationWidth: ").append(elevationWidth).append("\n");
-    sb.append(" elevationPullRate: ").append(elevationPullRate).append("\n");
-    sb.append(" elevationPullAcceleration: ").append(elevationPullAcceleration).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
deleted file mode 100644
index 04114fe877fbe95de001f637507d24852eb68059..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AngularVelocityVector extends Object implements Serializable
-{
-   /** velocity about the x axis */
-   protected float  x = (float)0;
-
-   /** velocity about the y axis */
-   protected float  y = (float)0;
-
-   /** velocity about the zaxis */
-   protected float  z = (float)0;
-
-
-/** Constructor */
- public AngularVelocityVector()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // x
-   marshalSize += 4;  // y
-   marshalSize += 4;  // z
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AngularVelocityVector#x}*/
-public AngularVelocityVector setX(float pX)
-{
-    x = pX;
-    return this;
-}
-
-/** Getter for {@link AngularVelocityVector#x}*/
-public float getX()
-{
-    return x; 
-}
-
-/** Setter for {@link AngularVelocityVector#y}*/
-public AngularVelocityVector setY(float pY)
-{
-    y = pY;
-    return this;
-}
-
-/** Getter for {@link AngularVelocityVector#y}*/
-public float getY()
-{
-    return y; 
-}
-
-/** Setter for {@link AngularVelocityVector#z}*/
-public AngularVelocityVector setZ(float pZ)
-{
-    z = pZ;
-    return this;
-}
-
-/** Getter for {@link AngularVelocityVector#z}*/
-public float getZ()
-{
-    return z; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(x);
-       dos.writeFloat(y);
-       dos.writeFloat(z);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        x = dis.readFloat();
-        uPosition += 4;
-        y = dis.readFloat();
-        uPosition += 4;
-        z = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)x);
-   buff.putFloat( (float)y);
-   buff.putFloat( (float)z);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    x = buff.getFloat();
-    y = buff.getFloat();
-    z = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AngularVelocityVector rhs = (AngularVelocityVector)obj;
-
-     if( ! (x == rhs.x)) ivarsEqual = false;
-     if( ! (y == rhs.y)) ivarsEqual = false;
-     if( ! (z == rhs.z)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" x: ").append(x).append("\n");
-    sb.append(" y: ").append(y).append("\n");
-    sb.append(" z: ").append(z).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AntennaLocation.java b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
deleted file mode 100644
index 02c2d196b6046e2075b8673039f20900bc414c9a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AntennaLocation.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AntennaLocation extends Object implements Serializable
-{
-   /** Location of the radiating portion of the antenna in world coordinates */
-   protected Vector3Double  antennaLocation = new Vector3Double(); 
-
-   /** Location of the radiating portion of the antenna in entity coordinates */
-   protected Vector3Float  relativeAntennaLocation = new Vector3Float(); 
-
-
-/** Constructor */
- public AntennaLocation()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += antennaLocation.getMarshalledSize();
-   marshalSize += relativeAntennaLocation.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AntennaLocation#antennaLocation}*/
-public AntennaLocation setAntennaLocation(Vector3Double pAntennaLocation)
-{
-    antennaLocation = pAntennaLocation;
-    return this;
-}
-
-/** Getter for {@link AntennaLocation#antennaLocation}*/
-public Vector3Double getAntennaLocation()
-{
-    return antennaLocation; 
-}
-
-/** Setter for {@link AntennaLocation#relativeAntennaLocation}*/
-public AntennaLocation setRelativeAntennaLocation(Vector3Float pRelativeAntennaLocation)
-{
-    relativeAntennaLocation = pRelativeAntennaLocation;
-    return this;
-}
-
-/** Getter for {@link AntennaLocation#relativeAntennaLocation}*/
-public Vector3Float getRelativeAntennaLocation()
-{
-    return relativeAntennaLocation; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       antennaLocation.marshal(dos);
-       relativeAntennaLocation.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += antennaLocation.unmarshal(dis);
-        uPosition += relativeAntennaLocation.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   antennaLocation.marshal(buff);
-   relativeAntennaLocation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    antennaLocation.unmarshal(buff);
-    relativeAntennaLocation.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AntennaLocation rhs = (AntennaLocation)obj;
-
-     if( ! (antennaLocation.equals( rhs.antennaLocation) )) ivarsEqual = false;
-     if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
-    sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Appearance.java b/src-generated/edu/nps/moves/dis7/Appearance.java
deleted file mode 100644
index b74e9008c05b058a4a80987586851d759ba2afb4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Appearance.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * used in AppearancePdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Appearance extends Object implements Serializable
-{
-   protected int  visual;
-
-   protected int  ir;
-
-   protected int  em;
-
-   protected int  audio;
-
-
-/** Constructor */
- public Appearance()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // visual
-   marshalSize += 4;  // ir
-   marshalSize += 4;  // em
-   marshalSize += 4;  // audio
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Appearance#visual}*/
-public Appearance setVisual(int pVisual)
-{
-    visual = pVisual;
-    return this;
-}
-
-/** Getter for {@link Appearance#visual}*/
-public int getVisual()
-{
-    return visual; 
-}
-
-/** Setter for {@link Appearance#ir}*/
-public Appearance setIr(int pIr)
-{
-    ir = pIr;
-    return this;
-}
-
-/** Getter for {@link Appearance#ir}*/
-public int getIr()
-{
-    return ir; 
-}
-
-/** Setter for {@link Appearance#em}*/
-public Appearance setEm(int pEm)
-{
-    em = pEm;
-    return this;
-}
-
-/** Getter for {@link Appearance#em}*/
-public int getEm()
-{
-    return em; 
-}
-
-/** Setter for {@link Appearance#audio}*/
-public Appearance setAudio(int pAudio)
-{
-    audio = pAudio;
-    return this;
-}
-
-/** Getter for {@link Appearance#audio}*/
-public int getAudio()
-{
-    return audio; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(visual);
-       dos.writeInt(ir);
-       dos.writeInt(em);
-       dos.writeInt(audio);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        visual = dis.readInt();
-        uPosition += 4;
-        ir = dis.readInt();
-        uPosition += 4;
-        em = dis.readInt();
-        uPosition += 4;
-        audio = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)visual);
-   buff.putInt( (int)ir);
-   buff.putInt( (int)em);
-   buff.putInt( (int)audio);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    visual = buff.getInt();
-    ir = buff.getInt();
-    em = buff.getInt();
-    audio = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Appearance rhs = (Appearance)obj;
-
-     if( ! (visual == rhs.visual)) ivarsEqual = false;
-     if( ! (ir == rhs.ir)) ivarsEqual = false;
-     if( ! (em == rhs.em)) ivarsEqual = false;
-     if( ! (audio == rhs.audio)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" visual: ").append(visual).append("\n");
-    sb.append(" ir: ").append(ir).append("\n");
-    sb.append(" em: ").append(em).append("\n");
-    sb.append(" audio: ").append(audio).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AppearancePdu.java b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
deleted file mode 100644
index d078f743bda7f33a56dce7cf2d2e36e7945a6a0e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AppearancePdu.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.3 Communicate information about the appearance of a live entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AppearancePdu extends LiveEntityFamilyPdu implements Serializable
-{
-   protected EntityID  liveEntityId = new EntityID(); 
-
-   /** 16-bit bit field */
-   protected short  appearanceFlags;
-
-   /**  uid 6 */
-   protected ForceID forceId = ForceID.values()[0];
-
-   protected EntityType  entityType = new EntityType(); 
-
-   protected EntityType  alternateEntityType = new EntityType(); 
-
-   protected EntityMarking  entityMarking = new EntityMarking(); 
-
-   protected EntityCapabilities  capabilities =  new LandPlatformCapabilities(); 
-
-   protected Appearance  appearanceFields = new Appearance(); 
-
-
-/** Constructor */
- public AppearancePdu()
- {
-    setPduType( DISPDUType.APPEARANCE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += liveEntityId.getMarshalledSize();
-   marshalSize += 2;  // appearanceFlags
-   marshalSize += forceId.getMarshalledSize();
-   marshalSize += entityType.getMarshalledSize();
-   marshalSize += alternateEntityType.getMarshalledSize();
-   marshalSize += entityMarking.getMarshalledSize();
-   marshalSize += capabilities.getMarshalledSize();
-   marshalSize += appearanceFields.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AppearancePdu#liveEntityId}*/
-public AppearancePdu setLiveEntityId(EntityID pLiveEntityId)
-{
-    liveEntityId = pLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#liveEntityId}*/
-public EntityID getLiveEntityId()
-{
-    return liveEntityId; 
-}
-
-/** Setter for {@link AppearancePdu#appearanceFlags}*/
-public AppearancePdu setAppearanceFlags(short pAppearanceFlags)
-{
-    appearanceFlags = pAppearanceFlags;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#appearanceFlags}*/
-public short getAppearanceFlags()
-{
-    return appearanceFlags; 
-}
-
-/** Setter for {@link AppearancePdu#forceId}*/
-public AppearancePdu setForceId(ForceID pForceId)
-{
-    forceId = pForceId;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#forceId}*/
-public ForceID getForceId()
-{
-    return forceId; 
-}
-
-/** Setter for {@link AppearancePdu#entityType}*/
-public AppearancePdu setEntityType(EntityType pEntityType)
-{
-    entityType = pEntityType;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#entityType}*/
-public EntityType getEntityType()
-{
-    return entityType; 
-}
-
-/** Setter for {@link AppearancePdu#alternateEntityType}*/
-public AppearancePdu setAlternateEntityType(EntityType pAlternateEntityType)
-{
-    alternateEntityType = pAlternateEntityType;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#alternateEntityType}*/
-public EntityType getAlternateEntityType()
-{
-    return alternateEntityType; 
-}
-
-/** Setter for {@link AppearancePdu#entityMarking}*/
-public AppearancePdu setEntityMarking(EntityMarking pEntityMarking)
-{
-    entityMarking = pEntityMarking;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#entityMarking}*/
-public EntityMarking getEntityMarking()
-{
-    return entityMarking; 
-}
-
-/** Setter for {@link AppearancePdu#capabilities}*/
-public AppearancePdu setCapabilities(EntityCapabilities pCapabilities)
-{
-    capabilities = pCapabilities;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#capabilities}*/
-public EntityCapabilities getCapabilities()
-{
-    return capabilities; 
-}
-
-/** Setter for {@link AppearancePdu#appearanceFields}*/
-public AppearancePdu setAppearanceFields(Appearance pAppearanceFields)
-{
-    appearanceFields = pAppearanceFields;
-    return this;
-}
-
-/** Getter for {@link AppearancePdu#appearanceFields}*/
-public Appearance getAppearanceFields()
-{
-    return appearanceFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       liveEntityId.marshal(dos);
-       dos.writeShort(appearanceFlags);
-       forceId.marshal(dos);
-       entityType.marshal(dos);
-       alternateEntityType.marshal(dos);
-       entityMarking.marshal(dos);
-       capabilities.marshal(dos);
-       appearanceFields.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += liveEntityId.unmarshal(dis);
-        appearanceFlags = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        forceId = ForceID.unmarshalEnum(dis);
-        uPosition += forceId.getMarshalledSize();
-        uPosition += entityType.unmarshal(dis);
-        uPosition += alternateEntityType.unmarshal(dis);
-        uPosition += entityMarking.unmarshal(dis);
-        uPosition += capabilities.unmarshal(dis);
-        uPosition += appearanceFields.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   liveEntityId.marshal(buff);
-   buff.putShort( (short)appearanceFlags);
-   forceId.marshal(buff);
-   entityType.marshal(buff);
-   alternateEntityType.marshal(buff);
-   entityMarking.marshal(buff);
-   capabilities.marshal(buff);
-   appearanceFields.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    liveEntityId.unmarshal(buff);
-    appearanceFlags = (short)(buff.getShort() & 0xFFFF);
-    forceId = ForceID.unmarshalEnum(buff);
-    entityType.unmarshal(buff);
-    alternateEntityType.unmarshal(buff);
-    entityMarking.unmarshal(buff);
-    capabilities.unmarshal(buff);
-    appearanceFields.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AppearancePdu rhs = (AppearancePdu)obj;
-
-     if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
-     if( ! (appearanceFlags == rhs.appearanceFlags)) ivarsEqual = false;
-     if( ! (forceId == rhs.forceId)) ivarsEqual = false;
-     if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
-     if( ! (alternateEntityType.equals( rhs.alternateEntityType) )) ivarsEqual = false;
-     if( ! (entityMarking.equals( rhs.entityMarking) )) ivarsEqual = false;
-     if( ! (capabilities.equals( rhs.capabilities) )) ivarsEqual = false;
-     if( ! (appearanceFields.equals( rhs.appearanceFields) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
-    sb.append(" appearanceFlags: ").append(appearanceFlags).append("\n");
-    sb.append(" forceId: ").append(forceId).append("\n");
-    sb.append(" entityType: ").append(entityType).append("\n");
-    sb.append(" alternateEntityType: ").append(alternateEntityType).append("\n");
-    sb.append(" entityMarking: ").append(entityMarking).append("\n");
-    sb.append(" capabilities: ").append(capabilities).append("\n");
-    sb.append(" appearanceFields: ").append(appearanceFields).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
deleted file mode 100644
index d90c2f54a4370e1291890a3689ed06d0cc3be77c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.6 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a set of three or more points that come to a closure.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ArealObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
-   /** Object in synthetic environment */
-   protected ObjectIdentifier  objectID = new ObjectIdentifier(); 
-
-   /** Object with which this point object is associated */
-   protected ObjectIdentifier  referencedObjectID = new ObjectIdentifier(); 
-
-   /** unique update number of each state transition of an object */
-   protected short  updateNumber;
-
-   /** force ID uid 6 */
-   protected ForceID forceID = ForceID.values()[0];
-
-   /** modifications enumeration uid 242 */
-   protected ObjectStateModificationArealObject modifications = new ObjectStateModificationArealObject();
-
-   /** Object type */
-   protected ObjectType  objectType = new ObjectType(); 
-
-   /** Object appearance */
-   protected int  specificObjectAppearance;
-
-   /** Object appearance */
-   protected short  generalObjectAppearance;
-
-   /** Number of points */
-   protected short  numberOfPoints;
-
-   /** requesterID */
-   protected SimulationAddress  requesterID = new SimulationAddress(); 
-
-   /** receiver ID */
-   protected SimulationAddress  receivingID = new SimulationAddress(); 
-
-   /** location of object */
-   protected List< Vector3Double > objectLocation = new ArrayList< Vector3Double >();
- 
-
-/** Constructor */
- public ArealObjectStatePdu()
- {
-    setPduType( DISPDUType.AREAL_OBJECT_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += objectID.getMarshalledSize();
-   marshalSize += referencedObjectID.getMarshalledSize();
-   marshalSize += 2;  // updateNumber
-   marshalSize += forceID.getMarshalledSize();
-   marshalSize += modifications.getMarshalledSize();
-   marshalSize += objectType.getMarshalledSize();
-   marshalSize += 4;  // specificObjectAppearance
-   marshalSize += 2;  // generalObjectAppearance
-   marshalSize += 2;  // numberOfPoints
-   marshalSize += requesterID.getMarshalledSize();
-   marshalSize += receivingID.getMarshalledSize();
-   for(int idx=0; idx < objectLocation.size(); idx++)
-   {
-        Vector3Double listElement = objectLocation.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ArealObjectStatePdu#objectID}*/
-public ArealObjectStatePdu setObjectID(ObjectIdentifier pObjectID)
-{
-    objectID = pObjectID;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#objectID}*/
-public ObjectIdentifier getObjectID()
-{
-    return objectID; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#referencedObjectID}*/
-public ArealObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
-{
-    referencedObjectID = pReferencedObjectID;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#referencedObjectID}*/
-public ObjectIdentifier getReferencedObjectID()
-{
-    return referencedObjectID; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#updateNumber}*/
-public ArealObjectStatePdu setUpdateNumber(short pUpdateNumber)
-{
-    updateNumber = pUpdateNumber;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#updateNumber}*/
-public short getUpdateNumber()
-{
-    return updateNumber; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#forceID}*/
-public ArealObjectStatePdu setForceID(ForceID pForceID)
-{
-    forceID = pForceID;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#forceID}*/
-public ForceID getForceID()
-{
-    return forceID; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#modifications}*/
-public ArealObjectStatePdu setModifications(ObjectStateModificationArealObject pModifications)
-{
-    modifications = pModifications;
-    return this;
-}
-
-/** Setter for {@link ArealObjectStatePdu#modifications}*/
-public ObjectStateModificationArealObject getModifications()
-{
-    return modifications; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#objectType}*/
-public ArealObjectStatePdu setObjectType(ObjectType pObjectType)
-{
-    objectType = pObjectType;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#objectType}*/
-public ObjectType getObjectType()
-{
-    return objectType; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#specificObjectAppearance}*/
-public ArealObjectStatePdu setSpecificObjectAppearance(int pSpecificObjectAppearance)
-{
-    specificObjectAppearance = pSpecificObjectAppearance;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#specificObjectAppearance}*/
-public int getSpecificObjectAppearance()
-{
-    return specificObjectAppearance; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#generalObjectAppearance}*/
-public ArealObjectStatePdu setGeneralObjectAppearance(short pGeneralObjectAppearance)
-{
-    generalObjectAppearance = pGeneralObjectAppearance;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#generalObjectAppearance}*/
-public short getGeneralObjectAppearance()
-{
-    return generalObjectAppearance; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#requesterID}*/
-public ArealObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
-{
-    requesterID = pRequesterID;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#requesterID}*/
-public SimulationAddress getRequesterID()
-{
-    return requesterID; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#receivingID}*/
-public ArealObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
-{
-    receivingID = pReceivingID;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#receivingID}*/
-public SimulationAddress getReceivingID()
-{
-    return receivingID; 
-}
-
-/** Setter for {@link ArealObjectStatePdu#objectLocation}*/
-public ArealObjectStatePdu setObjectLocation(List<Vector3Double> pObjectLocation)
-{
-    objectLocation = pObjectLocation;
-    return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#objectLocation}*/
-public List<Vector3Double> getObjectLocation()
-{
-    return objectLocation; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       objectID.marshal(dos);
-       referencedObjectID.marshal(dos);
-       dos.writeShort(updateNumber);
-       forceID.marshal(dos);
-       modifications.marshal(dos);
-       objectType.marshal(dos);
-       dos.writeInt(specificObjectAppearance);
-       dos.writeShort(generalObjectAppearance);
-       dos.writeShort(objectLocation.size());
-       requesterID.marshal(dos);
-       receivingID.marshal(dos);
-
-       for(int idx = 0; idx < objectLocation.size(); idx++)
-       {
-            Vector3Double aVector3Double = objectLocation.get(idx);
-            aVector3Double.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += objectID.unmarshal(dis);
-        uPosition += referencedObjectID.unmarshal(dis);
-        updateNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        forceID = ForceID.unmarshalEnum(dis);
-        uPosition += forceID.getMarshalledSize();
-        uPosition += modifications.unmarshal(dis);
-        uPosition += objectType.unmarshal(dis);
-        specificObjectAppearance = dis.readInt();
-        uPosition += 4;
-        generalObjectAppearance = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfPoints = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += requesterID.unmarshal(dis);
-        uPosition += receivingID.unmarshal(dis);
-        for(int idx = 0; idx < numberOfPoints; idx++)
-        {
-            Vector3Double anX = new Vector3Double();
-            uPosition += anX.unmarshal(dis);
-            objectLocation.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   objectID.marshal(buff);
-   referencedObjectID.marshal(buff);
-   buff.putShort( (short)updateNumber);
-   forceID.marshal(buff);
-   modifications.marshal(buff);
-   objectType.marshal(buff);
-   buff.putInt( (int)specificObjectAppearance);
-   buff.putShort( (short)generalObjectAppearance);
-   buff.putShort( (short)objectLocation.size());
-   requesterID.marshal(buff);
-   receivingID.marshal(buff);
-
-   for(int idx = 0; idx < objectLocation.size(); idx++)
-   {
-        Vector3Double aVector3Double = objectLocation.get(idx);
-        aVector3Double.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    objectID.unmarshal(buff);
-    referencedObjectID.unmarshal(buff);
-    updateNumber = (short)(buff.getShort() & 0xFFFF);
-    forceID = ForceID.unmarshalEnum(buff);
-    modifications.unmarshal(buff);
-    objectType.unmarshal(buff);
-    specificObjectAppearance = buff.getInt();
-    generalObjectAppearance = (short)(buff.getShort() & 0xFFFF);
-    numberOfPoints = (short)(buff.getShort() & 0xFFFF);
-    requesterID.unmarshal(buff);
-    receivingID.unmarshal(buff);
-    for(int idx = 0; idx < numberOfPoints; idx++)
-    {
-    Vector3Double anX = new Vector3Double();
-    anX.unmarshal(buff);
-    objectLocation.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ArealObjectStatePdu rhs = (ArealObjectStatePdu)obj;
-
-     if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
-     if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
-     if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
-     if( ! (forceID == rhs.forceID)) ivarsEqual = false;
-     if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
-     if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
-     if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
-     if( ! (generalObjectAppearance == rhs.generalObjectAppearance)) ivarsEqual = false;
-     if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
-     if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < objectLocation.size(); idx++)
-        if( ! ( objectLocation.get(idx).equals(rhs.objectLocation.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" objectID: ").append(objectID).append("\n");
-    sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
-    sb.append(" updateNumber: ").append(updateNumber).append("\n");
-    sb.append(" forceID: ").append(forceID).append("\n");
-    sb.append(" modifications: ").append(modifications).append("\n");
-    sb.append(" objectType: ").append(objectType).append("\n");
-    sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
-    sb.append(" generalObjectAppearance: ").append(generalObjectAppearance).append("\n");
-    sb.append(" requesterID: ").append(requesterID).append("\n");
-    sb.append(" receivingID: ").append(receivingID).append("\n");
-    sb.append(" objectLocation: ").append("\n");
-    objectLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
deleted file mode 100644
index 1a51e080a57e95639b6d9dcb46f0007daaddfb85..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.94.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ArticulatedPartVP extends Object implements Serializable
-{
-   /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
-   protected VariableParameterRecordType recordType = VariableParameterRecordType.ARTICULATED_PART;
-
-   /** indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change  */
-   protected byte  changeIndicator = (byte)0;
-
-   /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */
-   protected short  partAttachedTo = (short)0;
-
-   /** the type of parameter represented, 32 bit enumeration */
-   protected int  parameterType;
-
-   /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field  */
-   protected float  parameterValue;
-
-   protected int  padding;
-
-
-/** Constructor */
- public ArticulatedPartVP()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 1;  // changeIndicator
-   marshalSize += 2;  // partAttachedTo
-   marshalSize += 4;  // parameterType
-   marshalSize += 4;  // parameterValue
-   marshalSize += 4;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ArticulatedPartVP#recordType}*/
-public ArticulatedPartVP setRecordType(VariableParameterRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#recordType}*/
-public VariableParameterRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link ArticulatedPartVP#changeIndicator}*/
-public ArticulatedPartVP setChangeIndicator(byte pChangeIndicator)
-{
-    changeIndicator = pChangeIndicator;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#changeIndicator}*/
-public byte getChangeIndicator()
-{
-    return changeIndicator; 
-}
-
-/** Setter for {@link ArticulatedPartVP#partAttachedTo}*/
-public ArticulatedPartVP setPartAttachedTo(short pPartAttachedTo)
-{
-    partAttachedTo = pPartAttachedTo;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#partAttachedTo}*/
-public short getPartAttachedTo()
-{
-    return partAttachedTo; 
-}
-
-/** Setter for {@link ArticulatedPartVP#parameterType}*/
-public ArticulatedPartVP setParameterType(int pParameterType)
-{
-    parameterType = pParameterType;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#parameterType}*/
-public int getParameterType()
-{
-    return parameterType; 
-}
-
-/** Setter for {@link ArticulatedPartVP#parameterValue}*/
-public ArticulatedPartVP setParameterValue(float pParameterValue)
-{
-    parameterValue = pParameterValue;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#parameterValue}*/
-public float getParameterValue()
-{
-    return parameterValue; 
-}
-
-/** Setter for {@link ArticulatedPartVP#padding}*/
-public ArticulatedPartVP setPadding(int pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#padding}*/
-public int getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeByte(changeIndicator);
-       dos.writeShort(partAttachedTo);
-       dos.writeInt(parameterType);
-       dos.writeFloat(parameterValue);
-       dos.writeInt(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableParameterRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        changeIndicator = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        partAttachedTo = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameterType = dis.readInt();
-        uPosition += 4;
-        parameterValue = dis.readFloat();
-        uPosition += 4;
-        padding = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   buff.put( (byte)changeIndicator);
-   buff.putShort( (short)partAttachedTo);
-   buff.putInt( (int)parameterType);
-   buff.putFloat( (float)parameterValue);
-   buff.putInt( (int)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableParameterRecordType.unmarshalEnum(buff);
-    changeIndicator = (byte)(buff.get() & 0xFF);
-    partAttachedTo = (short)(buff.getShort() & 0xFFFF);
-    parameterType = buff.getInt();
-    parameterValue = buff.getFloat();
-    padding = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ArticulatedPartVP rhs = (ArticulatedPartVP)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
-     if( ! (partAttachedTo == rhs.partAttachedTo)) ivarsEqual = false;
-     if( ! (parameterType == rhs.parameterType)) ivarsEqual = false;
-     if( ! (parameterValue == rhs.parameterValue)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
-    sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
-    sb.append(" parameterType: ").append(parameterType).append("\n");
-    sb.append(" parameterValue: ").append(parameterValue).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
deleted file mode 100644
index 4118acd29716e07d3e4988a95491774a3125625a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.4 Communicate information about an entity’s articulated and attached parts.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ArticulatedPartsPdu extends LiveEntityFamilyPdu implements Serializable
-{
-   protected EntityID  liveEntityId = new EntityID(); 
-
-   protected byte  numberOfParameterRecords;
-
-   protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
- 
-
-/** Constructor */
- public ArticulatedPartsPdu()
- {
-    setPduType( DISPDUType.ARTICULATED_PARTS );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += liveEntityId.getMarshalledSize();
-   marshalSize += 1;  // numberOfParameterRecords
-   for(int idx=0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter listElement = variableParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ArticulatedPartsPdu#liveEntityId}*/
-public ArticulatedPartsPdu setLiveEntityId(EntityID pLiveEntityId)
-{
-    liveEntityId = pLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartsPdu#liveEntityId}*/
-public EntityID getLiveEntityId()
-{
-    return liveEntityId; 
-}
-
-/** Setter for {@link ArticulatedPartsPdu#variableParameters}*/
-public ArticulatedPartsPdu setVariableParameters(List<VariableParameter> pVariableParameters)
-{
-    variableParameters = pVariableParameters;
-    return this;
-}
-
-/** Getter for {@link ArticulatedPartsPdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
-{
-    return variableParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       liveEntityId.marshal(dos);
-       dos.writeByte(variableParameters.size());
-
-       for(int idx = 0; idx < variableParameters.size(); idx++)
-       {
-            VariableParameter aVariableParameter = variableParameters.get(idx);
-            aVariableParameter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += liveEntityId.unmarshal(dis);
-        numberOfParameterRecords = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        for(int idx = 0; idx < numberOfParameterRecords; idx++)
-        {
-            VariableParameter anX = new VariableParameter();
-            uPosition += anX.unmarshal(dis);
-            variableParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   liveEntityId.marshal(buff);
-   buff.put( (byte)variableParameters.size());
-
-   for(int idx = 0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter aVariableParameter = variableParameters.get(idx);
-        aVariableParameter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    liveEntityId.unmarshal(buff);
-    numberOfParameterRecords = (byte)(buff.get() & 0xFF);
-    for(int idx = 0; idx < numberOfParameterRecords; idx++)
-    {
-    VariableParameter anX = new VariableParameter();
-    anX.unmarshal(buff);
-    variableParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ArticulatedPartsPdu rhs = (ArticulatedPartsPdu)obj;
-
-     if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < variableParameters.size(); idx++)
-        if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
-    sb.append(" variableParameters: ").append("\n");
-    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Association.java b/src-generated/edu/nps/moves/dis7/Association.java
deleted file mode 100644
index 27f6d25e0649301f645d3bffddf837e385cc88ff..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Association.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.9
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Association extends Object implements Serializable
-{
-   /**  330 */
-   protected EntityAssociationAssociationType associationType = EntityAssociationAssociationType.values()[0];
-
-   protected byte  padding;
-
-   /** identity of associated entity. If none, NO_SPECIFIC_ENTITY */
-   protected EntityIdentifier  associatedEntityID = new EntityIdentifier(); 
-
-   /** location, in world coordinates */
-   protected Vector3Double  associatedLocation = new Vector3Double(); 
-
-
-/** Constructor */
- public Association()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += associationType.getMarshalledSize();
-   marshalSize += 1;  // padding
-   marshalSize += associatedEntityID.getMarshalledSize();
-   marshalSize += associatedLocation.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Association#associationType}*/
-public Association setAssociationType(EntityAssociationAssociationType pAssociationType)
-{
-    associationType = pAssociationType;
-    return this;
-}
-
-/** Getter for {@link Association#associationType}*/
-public EntityAssociationAssociationType getAssociationType()
-{
-    return associationType; 
-}
-
-/** Setter for {@link Association#padding}*/
-public Association setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link Association#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link Association#associatedEntityID}*/
-public Association setAssociatedEntityID(EntityIdentifier pAssociatedEntityID)
-{
-    associatedEntityID = pAssociatedEntityID;
-    return this;
-}
-
-/** Getter for {@link Association#associatedEntityID}*/
-public EntityIdentifier getAssociatedEntityID()
-{
-    return associatedEntityID; 
-}
-
-/** Setter for {@link Association#associatedLocation}*/
-public Association setAssociatedLocation(Vector3Double pAssociatedLocation)
-{
-    associatedLocation = pAssociatedLocation;
-    return this;
-}
-
-/** Getter for {@link Association#associatedLocation}*/
-public Vector3Double getAssociatedLocation()
-{
-    return associatedLocation; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       associationType.marshal(dos);
-       dos.writeByte(padding);
-       associatedEntityID.marshal(dos);
-       associatedLocation.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        associationType = EntityAssociationAssociationType.unmarshalEnum(dis);
-        uPosition += associationType.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += associatedEntityID.unmarshal(dis);
-        uPosition += associatedLocation.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   associationType.marshal(buff);
-   buff.put( (byte)padding);
-   associatedEntityID.marshal(buff);
-   associatedLocation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    associationType = EntityAssociationAssociationType.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    associatedEntityID.unmarshal(buff);
-    associatedLocation.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Association rhs = (Association)obj;
-
-     if( ! (associationType == rhs.associationType)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (associatedEntityID.equals( rhs.associatedEntityID) )) ivarsEqual = false;
-     if( ! (associatedLocation.equals( rhs.associatedLocation) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" associationType: ").append(associationType).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" associatedEntityID: ").append(associatedEntityID).append("\n");
-    sb.append(" associatedLocation: ").append(associatedLocation).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
deleted file mode 100644
index 4359038b5d44ba6c55148cb2254d98f33351dd6d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Removable parts that may be attached to an entity.  Section 6.2.93.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AttachedPartVP extends Object implements Serializable
-{
-   /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
-   protected VariableParameterRecordType recordType = VariableParameterRecordType.ATTACHED_PART;
-
-   /** 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram uid 415 */
-   protected AttachedPartDetachedIndicator detachedIndicator = AttachedPartDetachedIndicator.values()[0];
-
-   /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */
-   protected short  partAttachedTo = (short)0;
-
-   /** The location or station to which the part is attached uid 57 */
-   protected AttachedParts parameterType = AttachedParts.values()[0];
-
-   /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field  */
-   protected EntityType  attachedPartType = new EntityType(); 
-
-
-/** Constructor */
- public AttachedPartVP()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += detachedIndicator.getMarshalledSize();
-   marshalSize += 2;  // partAttachedTo
-   marshalSize += parameterType.getMarshalledSize();
-   marshalSize += attachedPartType.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AttachedPartVP#recordType}*/
-public AttachedPartVP setRecordType(VariableParameterRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link AttachedPartVP#recordType}*/
-public VariableParameterRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link AttachedPartVP#detachedIndicator}*/
-public AttachedPartVP setDetachedIndicator(AttachedPartDetachedIndicator pDetachedIndicator)
-{
-    detachedIndicator = pDetachedIndicator;
-    return this;
-}
-
-/** Getter for {@link AttachedPartVP#detachedIndicator}*/
-public AttachedPartDetachedIndicator getDetachedIndicator()
-{
-    return detachedIndicator; 
-}
-
-/** Setter for {@link AttachedPartVP#partAttachedTo}*/
-public AttachedPartVP setPartAttachedTo(short pPartAttachedTo)
-{
-    partAttachedTo = pPartAttachedTo;
-    return this;
-}
-
-/** Getter for {@link AttachedPartVP#partAttachedTo}*/
-public short getPartAttachedTo()
-{
-    return partAttachedTo; 
-}
-
-/** Setter for {@link AttachedPartVP#parameterType}*/
-public AttachedPartVP setParameterType(AttachedParts pParameterType)
-{
-    parameterType = pParameterType;
-    return this;
-}
-
-/** Getter for {@link AttachedPartVP#parameterType}*/
-public AttachedParts getParameterType()
-{
-    return parameterType; 
-}
-
-/** Setter for {@link AttachedPartVP#attachedPartType}*/
-public AttachedPartVP setAttachedPartType(EntityType pAttachedPartType)
-{
-    attachedPartType = pAttachedPartType;
-    return this;
-}
-
-/** Getter for {@link AttachedPartVP#attachedPartType}*/
-public EntityType getAttachedPartType()
-{
-    return attachedPartType; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       detachedIndicator.marshal(dos);
-       dos.writeShort(partAttachedTo);
-       parameterType.marshal(dos);
-       attachedPartType.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableParameterRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        detachedIndicator = AttachedPartDetachedIndicator.unmarshalEnum(dis);
-        uPosition += detachedIndicator.getMarshalledSize();
-        partAttachedTo = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameterType = AttachedParts.unmarshalEnum(dis);
-        uPosition += parameterType.getMarshalledSize();
-        uPosition += attachedPartType.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   detachedIndicator.marshal(buff);
-   buff.putShort( (short)partAttachedTo);
-   parameterType.marshal(buff);
-   attachedPartType.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableParameterRecordType.unmarshalEnum(buff);
-    detachedIndicator = AttachedPartDetachedIndicator.unmarshalEnum(buff);
-    partAttachedTo = (short)(buff.getShort() & 0xFFFF);
-    parameterType = AttachedParts.unmarshalEnum(buff);
-    attachedPartType.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AttachedPartVP rhs = (AttachedPartVP)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (detachedIndicator == rhs.detachedIndicator)) ivarsEqual = false;
-     if( ! (partAttachedTo == rhs.partAttachedTo)) ivarsEqual = false;
-     if( ! (parameterType == rhs.parameterType)) ivarsEqual = false;
-     if( ! (attachedPartType.equals( rhs.attachedPartType) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" detachedIndicator: ").append(detachedIndicator).append("\n");
-    sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
-    sb.append(" parameterType: ").append(parameterType).append("\n");
-    sb.append(" attachedPartType: ").append(attachedPartType).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Attribute.java b/src-generated/edu/nps/moves/dis7/Attribute.java
deleted file mode 100644
index f670bcc9bb2ae950b93e4dd241d68519789e2136..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Attribute.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.10.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Attribute extends Object implements Serializable
-{
-   protected int  recordType;
-
-   protected short  recordLength;
-
-   protected byte[]  recordSpecificFields = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public Attribute()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += recordSpecificFields.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Attribute#recordType}*/
-public Attribute setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link Attribute#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link Attribute#recordSpecificFields}*/
-public Attribute setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
-    recordSpecificFields = pRecordSpecificFields;
-    return this;
-}
-
-/** Getter for {@link Attribute#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
-{
-    return recordSpecificFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordSpecificFields.length);
-
-       for(int idx = 0; idx < recordSpecificFields.length; idx++)
-           dos.writeByte(recordSpecificFields[idx]);
-
-       padding = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < recordSpecificFields.length; idx++)
-            recordSpecificFields[idx] = dis.readByte();
-        uPosition += (recordSpecificFields.length * 1);
-        padding = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordSpecificFields.length);
-
-   for(int idx = 0; idx < recordSpecificFields.length; idx++)
-       buff.put((byte)recordSpecificFields[idx]);
-
-   padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < recordSpecificFields.length; idx++)
-        recordSpecificFields[idx] = buff.get();
-    padding = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Attribute rhs = (Attribute)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordSpecificFields: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttributePdu.java b/src-generated/edu/nps/moves/dis7/AttributePdu.java
deleted file mode 100644
index becef027fd232dd53b29464de2803128ff784ede..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AttributePdu.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.6. Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard.. See 5.3.6.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AttributePdu extends EntityInformationFamilyPdu implements Serializable
-{
-   /** This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79). */
-   protected SimulationAddress  originatingSimulationAddress = new SimulationAddress(); 
-
-   /** Padding */
-   protected int  padding1;
-
-   /** Padding */
-   protected short  padding2;
-
-   /** This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration. uid 4 */
-   protected DISPDUType attributeRecordPduType = DISPDUType.values()[0];
-
-   /** This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration. uid 5 */
-   protected DISProtocolFamily attributeRecordProtocolVersion = DISProtocolFamily.values()[0];
-
-   /** This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration. uid 66 */
-   protected VariableRecordType masterAttributeRecordType = VariableRecordType.values()[0];
-
-   /** This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration. uid 295 */
-   protected DISAttributeActionCode actionCode = DISAttributeActionCode.values()[0];
-
-   /** Padding */
-   protected byte  padding3;
-
-   /** This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer. */
-   protected short  numberAttributeRecordSet;
-
-   protected List< AttributeRecordSet > attributeRecordSets = new ArrayList< AttributeRecordSet >();
- 
-
-/** Constructor */
- public AttributePdu()
- {
-    setPduType( DISPDUType.ATTRIBUTE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += originatingSimulationAddress.getMarshalledSize();
-   marshalSize += 4;  // padding1
-   marshalSize += 2;  // padding2
-   marshalSize += attributeRecordPduType.getMarshalledSize();
-   marshalSize += attributeRecordProtocolVersion.getMarshalledSize();
-   marshalSize += masterAttributeRecordType.getMarshalledSize();
-   marshalSize += actionCode.getMarshalledSize();
-   marshalSize += 1;  // padding3
-   marshalSize += 2;  // numberAttributeRecordSet
-   for(int idx=0; idx < attributeRecordSets.size(); idx++)
-   {
-        AttributeRecordSet listElement = attributeRecordSets.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AttributePdu#originatingSimulationAddress}*/
-public AttributePdu setOriginatingSimulationAddress(SimulationAddress pOriginatingSimulationAddress)
-{
-    originatingSimulationAddress = pOriginatingSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#originatingSimulationAddress}*/
-public SimulationAddress getOriginatingSimulationAddress()
-{
-    return originatingSimulationAddress; 
-}
-
-/** Setter for {@link AttributePdu#padding1}*/
-public AttributePdu setPadding1(int pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#padding1}*/
-public int getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link AttributePdu#padding2}*/
-public AttributePdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link AttributePdu#attributeRecordPduType}*/
-public AttributePdu setAttributeRecordPduType(DISPDUType pAttributeRecordPduType)
-{
-    attributeRecordPduType = pAttributeRecordPduType;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#attributeRecordPduType}*/
-public DISPDUType getAttributeRecordPduType()
-{
-    return attributeRecordPduType; 
-}
-
-/** Setter for {@link AttributePdu#attributeRecordProtocolVersion}*/
-public AttributePdu setAttributeRecordProtocolVersion(DISProtocolFamily pAttributeRecordProtocolVersion)
-{
-    attributeRecordProtocolVersion = pAttributeRecordProtocolVersion;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#attributeRecordProtocolVersion}*/
-public DISProtocolFamily getAttributeRecordProtocolVersion()
-{
-    return attributeRecordProtocolVersion; 
-}
-
-/** Setter for {@link AttributePdu#masterAttributeRecordType}*/
-public AttributePdu setMasterAttributeRecordType(VariableRecordType pMasterAttributeRecordType)
-{
-    masterAttributeRecordType = pMasterAttributeRecordType;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#masterAttributeRecordType}*/
-public VariableRecordType getMasterAttributeRecordType()
-{
-    return masterAttributeRecordType; 
-}
-
-/** Setter for {@link AttributePdu#actionCode}*/
-public AttributePdu setActionCode(DISAttributeActionCode pActionCode)
-{
-    actionCode = pActionCode;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#actionCode}*/
-public DISAttributeActionCode getActionCode()
-{
-    return actionCode; 
-}
-
-/** Setter for {@link AttributePdu#padding3}*/
-public AttributePdu setPadding3(byte pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#padding3}*/
-public byte getPadding3()
-{
-    return padding3; 
-}
-
-/** Setter for {@link AttributePdu#attributeRecordSets}*/
-public AttributePdu setAttributeRecordSets(List<AttributeRecordSet> pAttributeRecordSets)
-{
-    attributeRecordSets = pAttributeRecordSets;
-    return this;
-}
-
-/** Getter for {@link AttributePdu#attributeRecordSets}*/
-public List<AttributeRecordSet> getAttributeRecordSets()
-{
-    return attributeRecordSets; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       originatingSimulationAddress.marshal(dos);
-       dos.writeInt(padding1);
-       dos.writeShort(padding2);
-       attributeRecordPduType.marshal(dos);
-       attributeRecordProtocolVersion.marshal(dos);
-       masterAttributeRecordType.marshal(dos);
-       actionCode.marshal(dos);
-       dos.writeByte(padding3);
-       dos.writeShort(attributeRecordSets.size());
-
-       for(int idx = 0; idx < attributeRecordSets.size(); idx++)
-       {
-            AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
-            aAttributeRecordSet.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += originatingSimulationAddress.unmarshal(dis);
-        padding1 = dis.readInt();
-        uPosition += 4;
-        padding2 = dis.readShort();
-        uPosition += 4;
-        attributeRecordPduType = DISPDUType.unmarshalEnum(dis);
-        uPosition += attributeRecordPduType.getMarshalledSize();
-        attributeRecordProtocolVersion = DISProtocolFamily.unmarshalEnum(dis);
-        uPosition += attributeRecordProtocolVersion.getMarshalledSize();
-        masterAttributeRecordType = VariableRecordType.unmarshalEnum(dis);
-        uPosition += masterAttributeRecordType.getMarshalledSize();
-        actionCode = DISAttributeActionCode.unmarshalEnum(dis);
-        uPosition += actionCode.getMarshalledSize();
-        padding3 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberAttributeRecordSet = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberAttributeRecordSet; idx++)
-        {
-            AttributeRecordSet anX = new AttributeRecordSet();
-            uPosition += anX.unmarshal(dis);
-            attributeRecordSets.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   originatingSimulationAddress.marshal(buff);
-   buff.putInt( (int)padding1);
-   buff.putShort( (short)padding2);
-   attributeRecordPduType.marshal(buff);
-   attributeRecordProtocolVersion.marshal(buff);
-   masterAttributeRecordType.marshal(buff);
-   actionCode.marshal(buff);
-   buff.put( (byte)padding3);
-   buff.putShort( (short)attributeRecordSets.size());
-
-   for(int idx = 0; idx < attributeRecordSets.size(); idx++)
-   {
-        AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
-        aAttributeRecordSet.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    originatingSimulationAddress.unmarshal(buff);
-    padding1 = buff.getInt();
-    padding2 = buff.getShort();
-    attributeRecordPduType = DISPDUType.unmarshalEnum(buff);
-    attributeRecordProtocolVersion = DISProtocolFamily.unmarshalEnum(buff);
-    masterAttributeRecordType = VariableRecordType.unmarshalEnum(buff);
-    actionCode = DISAttributeActionCode.unmarshalEnum(buff);
-    padding3 = (byte)(buff.get() & 0xFF);
-    numberAttributeRecordSet = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberAttributeRecordSet; idx++)
-    {
-    AttributeRecordSet anX = new AttributeRecordSet();
-    anX.unmarshal(buff);
-    attributeRecordSets.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AttributePdu rhs = (AttributePdu)obj;
-
-     if( ! (originatingSimulationAddress.equals( rhs.originatingSimulationAddress) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (attributeRecordPduType == rhs.attributeRecordPduType)) ivarsEqual = false;
-     if( ! (attributeRecordProtocolVersion == rhs.attributeRecordProtocolVersion)) ivarsEqual = false;
-     if( ! (masterAttributeRecordType == rhs.masterAttributeRecordType)) ivarsEqual = false;
-     if( ! (actionCode == rhs.actionCode)) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-
-     for(int idx = 0; idx < attributeRecordSets.size(); idx++)
-        if( ! ( attributeRecordSets.get(idx).equals(rhs.attributeRecordSets.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" originatingSimulationAddress: ").append(originatingSimulationAddress).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" attributeRecordPduType: ").append(attributeRecordPduType).append("\n");
-    sb.append(" attributeRecordProtocolVersion: ").append(attributeRecordProtocolVersion).append("\n");
-    sb.append(" masterAttributeRecordType: ").append(masterAttributeRecordType).append("\n");
-    sb.append(" actionCode: ").append(actionCode).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-    sb.append(" attributeRecordSets: ").append("\n");
-    attributeRecordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
deleted file mode 100644
index af470fbbe0ba3c532ebcc677ba135c779bc5cf99..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class AttributeRecordSet extends Object implements Serializable
-{
-   protected EntityID  entityId = new EntityID(); 
-
-   protected short  numberOfAttributeRecords;
-
-   protected List< Attribute > attributeRecords = new ArrayList< Attribute >();
- 
-
-/** Constructor */
- public AttributeRecordSet()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityId.getMarshalledSize();
-   marshalSize += 2;  // numberOfAttributeRecords
-   for(int idx=0; idx < attributeRecords.size(); idx++)
-   {
-        Attribute listElement = attributeRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link AttributeRecordSet#entityId}*/
-public AttributeRecordSet setEntityId(EntityID pEntityId)
-{
-    entityId = pEntityId;
-    return this;
-}
-
-/** Getter for {@link AttributeRecordSet#entityId}*/
-public EntityID getEntityId()
-{
-    return entityId; 
-}
-
-/** Setter for {@link AttributeRecordSet#attributeRecords}*/
-public AttributeRecordSet setAttributeRecords(List<Attribute> pAttributeRecords)
-{
-    attributeRecords = pAttributeRecords;
-    return this;
-}
-
-/** Getter for {@link AttributeRecordSet#attributeRecords}*/
-public List<Attribute> getAttributeRecords()
-{
-    return attributeRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityId.marshal(dos);
-       dos.writeShort(attributeRecords.size());
-
-       for(int idx = 0; idx < attributeRecords.size(); idx++)
-       {
-            Attribute aAttribute = attributeRecords.get(idx);
-            aAttribute.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += entityId.unmarshal(dis);
-        numberOfAttributeRecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfAttributeRecords; idx++)
-        {
-            Attribute anX = new Attribute();
-            uPosition += anX.unmarshal(dis);
-            attributeRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityId.marshal(buff);
-   buff.putShort( (short)attributeRecords.size());
-
-   for(int idx = 0; idx < attributeRecords.size(); idx++)
-   {
-        Attribute aAttribute = attributeRecords.get(idx);
-        aAttribute.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityId.unmarshal(buff);
-    numberOfAttributeRecords = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfAttributeRecords; idx++)
-    {
-    Attribute anX = new Attribute();
-    anX.unmarshal(buff);
-    attributeRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final AttributeRecordSet rhs = (AttributeRecordSet)obj;
-
-     if( ! (entityId.equals( rhs.entityId) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < attributeRecords.size(); idx++)
-        if( ! ( attributeRecords.get(idx).equals(rhs.attributeRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityId: ").append(entityId).append("\n");
-    sb.append(" attributeRecords: ").append("\n");
-    attributeRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
deleted file mode 100644
index f9b87420bb5eee05a1be12e4a6437618061c873d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class BeamAntennaPattern extends Object implements Serializable
-{
-   /** The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record. */
-   protected EulerAngles  beamDirection = new EulerAngles(); 
-
-   protected float  azimuthBeamwidth = (float)0;
-
-   protected float  elevationBeamwidth = (float)0;
-
-   /**  uid 168 */
-   protected TransmitterAntennaPatternReferenceSystem referenceSystem = TransmitterAntennaPatternReferenceSystem.values()[0];
-
-   protected byte  padding1 = (byte)0;
-
-   protected short  padding2 = (short)0;
-
-   /** This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna.  */
-   protected float  ez = (float)0.0;
-
-   /** This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna. */
-   protected float  ex = (float)0.0;
-
-   /** This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI */
-   protected float  phase = (float)0.0;
-
-   /** padding */
-   protected int  padding3 = (int)0;
-
-
-/** Constructor */
- public BeamAntennaPattern()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += beamDirection.getMarshalledSize();
-   marshalSize += 4;  // azimuthBeamwidth
-   marshalSize += 4;  // elevationBeamwidth
-   marshalSize += referenceSystem.getMarshalledSize();
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-   marshalSize += 4;  // ez
-   marshalSize += 4;  // ex
-   marshalSize += 4;  // phase
-   marshalSize += 4;  // padding3
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link BeamAntennaPattern#beamDirection}*/
-public BeamAntennaPattern setBeamDirection(EulerAngles pBeamDirection)
-{
-    beamDirection = pBeamDirection;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#beamDirection}*/
-public EulerAngles getBeamDirection()
-{
-    return beamDirection; 
-}
-
-/** Setter for {@link BeamAntennaPattern#azimuthBeamwidth}*/
-public BeamAntennaPattern setAzimuthBeamwidth(float pAzimuthBeamwidth)
-{
-    azimuthBeamwidth = pAzimuthBeamwidth;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#azimuthBeamwidth}*/
-public float getAzimuthBeamwidth()
-{
-    return azimuthBeamwidth; 
-}
-
-/** Setter for {@link BeamAntennaPattern#elevationBeamwidth}*/
-public BeamAntennaPattern setElevationBeamwidth(float pElevationBeamwidth)
-{
-    elevationBeamwidth = pElevationBeamwidth;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#elevationBeamwidth}*/
-public float getElevationBeamwidth()
-{
-    return elevationBeamwidth; 
-}
-
-/** Setter for {@link BeamAntennaPattern#referenceSystem}*/
-public BeamAntennaPattern setReferenceSystem(TransmitterAntennaPatternReferenceSystem pReferenceSystem)
-{
-    referenceSystem = pReferenceSystem;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#referenceSystem}*/
-public TransmitterAntennaPatternReferenceSystem getReferenceSystem()
-{
-    return referenceSystem; 
-}
-
-/** Setter for {@link BeamAntennaPattern#padding1}*/
-public BeamAntennaPattern setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link BeamAntennaPattern#padding2}*/
-public BeamAntennaPattern setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link BeamAntennaPattern#ez}*/
-public BeamAntennaPattern setEz(float pEz)
-{
-    ez = pEz;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#ez}*/
-public float getEz()
-{
-    return ez; 
-}
-
-/** Setter for {@link BeamAntennaPattern#ex}*/
-public BeamAntennaPattern setEx(float pEx)
-{
-    ex = pEx;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#ex}*/
-public float getEx()
-{
-    return ex; 
-}
-
-/** Setter for {@link BeamAntennaPattern#phase}*/
-public BeamAntennaPattern setPhase(float pPhase)
-{
-    phase = pPhase;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#phase}*/
-public float getPhase()
-{
-    return phase; 
-}
-
-/** Setter for {@link BeamAntennaPattern#padding3}*/
-public BeamAntennaPattern setPadding3(int pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#padding3}*/
-public int getPadding3()
-{
-    return padding3; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       beamDirection.marshal(dos);
-       dos.writeFloat(azimuthBeamwidth);
-       dos.writeFloat(elevationBeamwidth);
-       referenceSystem.marshal(dos);
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-       dos.writeFloat(ez);
-       dos.writeFloat(ex);
-       dos.writeFloat(phase);
-       dos.writeInt(padding3);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += beamDirection.unmarshal(dis);
-        azimuthBeamwidth = dis.readFloat();
-        uPosition += 4;
-        elevationBeamwidth = dis.readFloat();
-        uPosition += 4;
-        referenceSystem = TransmitterAntennaPatternReferenceSystem.unmarshalEnum(dis);
-        uPosition += referenceSystem.getMarshalledSize();
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        ez = dis.readFloat();
-        uPosition += 4;
-        ex = dis.readFloat();
-        uPosition += 4;
-        phase = dis.readFloat();
-        uPosition += 4;
-        padding3 = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   beamDirection.marshal(buff);
-   buff.putFloat( (float)azimuthBeamwidth);
-   buff.putFloat( (float)elevationBeamwidth);
-   referenceSystem.marshal(buff);
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-   buff.putFloat( (float)ez);
-   buff.putFloat( (float)ex);
-   buff.putFloat( (float)phase);
-   buff.putInt( (int)padding3);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    beamDirection.unmarshal(buff);
-    azimuthBeamwidth = buff.getFloat();
-    elevationBeamwidth = buff.getFloat();
-    referenceSystem = TransmitterAntennaPatternReferenceSystem.unmarshalEnum(buff);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    ez = buff.getFloat();
-    ex = buff.getFloat();
-    phase = buff.getFloat();
-    padding3 = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final BeamAntennaPattern rhs = (BeamAntennaPattern)obj;
-
-     if( ! (beamDirection.equals( rhs.beamDirection) )) ivarsEqual = false;
-     if( ! (azimuthBeamwidth == rhs.azimuthBeamwidth)) ivarsEqual = false;
-     if( ! (elevationBeamwidth == rhs.elevationBeamwidth)) ivarsEqual = false;
-     if( ! (referenceSystem == rhs.referenceSystem)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (ez == rhs.ez)) ivarsEqual = false;
-     if( ! (ex == rhs.ex)) ivarsEqual = false;
-     if( ! (phase == rhs.phase)) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" beamDirection: ").append(beamDirection).append("\n");
-    sb.append(" azimuthBeamwidth: ").append(azimuthBeamwidth).append("\n");
-    sb.append(" elevationBeamwidth: ").append(elevationBeamwidth).append("\n");
-    sb.append(" referenceSystem: ").append(referenceSystem).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" ez: ").append(ez).append("\n");
-    sb.append(" ex: ").append(ex).append("\n");
-    sb.append(" phase: ").append(phase).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamData.java b/src-generated/edu/nps/moves/dis7/BeamData.java
deleted file mode 100644
index 8a7a9b66e102ac0138f77c6ee88c0b6e82e93d2f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/BeamData.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Describes the scan volue of an emitter beam. Section 6.2.11.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class BeamData extends Object implements Serializable
-{
-   /** Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume */
-   protected float  beamAzimuthCenter;
-
-   /** Specifies the beam azimuth sweep to determine scan volume */
-   protected float  beamAzimuthSweep;
-
-   /** Specifies the beam elevation center to determine scan volume */
-   protected float  beamElevationCenter;
-
-   /** Specifies the beam elevation sweep to determine scan volume */
-   protected float  beamElevationSweep;
-
-   /** allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion. */
-   protected float  beamSweepSync;
-
-
-/** Constructor */
- public BeamData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // beamAzimuthCenter
-   marshalSize += 4;  // beamAzimuthSweep
-   marshalSize += 4;  // beamElevationCenter
-   marshalSize += 4;  // beamElevationSweep
-   marshalSize += 4;  // beamSweepSync
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link BeamData#beamAzimuthCenter}*/
-public BeamData setBeamAzimuthCenter(float pBeamAzimuthCenter)
-{
-    beamAzimuthCenter = pBeamAzimuthCenter;
-    return this;
-}
-
-/** Getter for {@link BeamData#beamAzimuthCenter}*/
-public float getBeamAzimuthCenter()
-{
-    return beamAzimuthCenter; 
-}
-
-/** Setter for {@link BeamData#beamAzimuthSweep}*/
-public BeamData setBeamAzimuthSweep(float pBeamAzimuthSweep)
-{
-    beamAzimuthSweep = pBeamAzimuthSweep;
-    return this;
-}
-
-/** Getter for {@link BeamData#beamAzimuthSweep}*/
-public float getBeamAzimuthSweep()
-{
-    return beamAzimuthSweep; 
-}
-
-/** Setter for {@link BeamData#beamElevationCenter}*/
-public BeamData setBeamElevationCenter(float pBeamElevationCenter)
-{
-    beamElevationCenter = pBeamElevationCenter;
-    return this;
-}
-
-/** Getter for {@link BeamData#beamElevationCenter}*/
-public float getBeamElevationCenter()
-{
-    return beamElevationCenter; 
-}
-
-/** Setter for {@link BeamData#beamElevationSweep}*/
-public BeamData setBeamElevationSweep(float pBeamElevationSweep)
-{
-    beamElevationSweep = pBeamElevationSweep;
-    return this;
-}
-
-/** Getter for {@link BeamData#beamElevationSweep}*/
-public float getBeamElevationSweep()
-{
-    return beamElevationSweep; 
-}
-
-/** Setter for {@link BeamData#beamSweepSync}*/
-public BeamData setBeamSweepSync(float pBeamSweepSync)
-{
-    beamSweepSync = pBeamSweepSync;
-    return this;
-}
-
-/** Getter for {@link BeamData#beamSweepSync}*/
-public float getBeamSweepSync()
-{
-    return beamSweepSync; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(beamAzimuthCenter);
-       dos.writeFloat(beamAzimuthSweep);
-       dos.writeFloat(beamElevationCenter);
-       dos.writeFloat(beamElevationSweep);
-       dos.writeFloat(beamSweepSync);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        beamAzimuthCenter = dis.readFloat();
-        uPosition += 4;
-        beamAzimuthSweep = dis.readFloat();
-        uPosition += 4;
-        beamElevationCenter = dis.readFloat();
-        uPosition += 4;
-        beamElevationSweep = dis.readFloat();
-        uPosition += 4;
-        beamSweepSync = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)beamAzimuthCenter);
-   buff.putFloat( (float)beamAzimuthSweep);
-   buff.putFloat( (float)beamElevationCenter);
-   buff.putFloat( (float)beamElevationSweep);
-   buff.putFloat( (float)beamSweepSync);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    beamAzimuthCenter = buff.getFloat();
-    beamAzimuthSweep = buff.getFloat();
-    beamElevationCenter = buff.getFloat();
-    beamElevationSweep = buff.getFloat();
-    beamSweepSync = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final BeamData rhs = (BeamData)obj;
-
-     if( ! (beamAzimuthCenter == rhs.beamAzimuthCenter)) ivarsEqual = false;
-     if( ! (beamAzimuthSweep == rhs.beamAzimuthSweep)) ivarsEqual = false;
-     if( ! (beamElevationCenter == rhs.beamElevationCenter)) ivarsEqual = false;
-     if( ! (beamElevationSweep == rhs.beamElevationSweep)) ivarsEqual = false;
-     if( ! (beamSweepSync == rhs.beamSweepSync)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" beamAzimuthCenter: ").append(beamAzimuthCenter).append("\n");
-    sb.append(" beamAzimuthSweep: ").append(beamAzimuthSweep).append("\n");
-    sb.append(" beamElevationCenter: ").append(beamElevationCenter).append("\n");
-    sb.append(" beamElevationSweep: ").append(beamElevationSweep).append("\n");
-    sb.append(" beamSweepSync: ").append(beamSweepSync).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamStatus.java b/src-generated/edu/nps/moves/dis7/BeamStatus.java
deleted file mode 100644
index d8b3fb15d39ac17320196458da12707e8fa16110..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/BeamStatus.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1). Section 6.2.12.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class BeamStatus extends Object implements Serializable
-{
-   /** First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding. 318 */
-   protected BeamStatusBeamState beamState = BeamStatusBeamState.values()[0];
-
-
-/** Constructor */
- public BeamStatus()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += beamState.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link BeamStatus#beamState}*/
-public BeamStatus setBeamState(BeamStatusBeamState pBeamState)
-{
-    beamState = pBeamState;
-    return this;
-}
-
-/** Getter for {@link BeamStatus#beamState}*/
-public BeamStatusBeamState getBeamState()
-{
-    return beamState; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       beamState.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        beamState = BeamStatusBeamState.unmarshalEnum(dis);
-        uPosition += beamState.getMarshalledSize();
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   beamState.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    beamState = BeamStatusBeamState.unmarshalEnum(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final BeamStatus rhs = (BeamStatus)obj;
-
-     if( ! (beamState == rhs.beamState)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" beamState: ").append(beamState).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BlankingSector.java b/src-generated/edu/nps/moves/dis7/BlankingSector.java
deleted file mode 100644
index 6ac5f25d5caae6fbe670fdd4b13090f7cebea904..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/BlankingSector.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.21.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class BlankingSector extends Object implements Serializable
-{
-   protected int  recordType = (int)3500;
-
-   protected short  recordLength = (short)40;
-
-   protected short  padding = (short)0;
-
-   protected byte  emitterNumber;
-
-   protected byte  beamNumber;
-
-   /**  uid 300 */
-   protected EEAttributeStateIndicator stateIndicator = EEAttributeStateIndicator.values()[0];
-
-   protected byte  padding2 = (byte)0;
-
-   protected float  leftAzimuth;
-
-   protected float  rightAzimuth;
-
-   protected float  lowerElevation;
-
-   protected float  upperElevation;
-
-   protected float  residualPower;
-
-   protected long  padding3 = (long)0;
-
-
-/** Constructor */
- public BlankingSector()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // padding
-   marshalSize += 1;  // emitterNumber
-   marshalSize += 1;  // beamNumber
-   marshalSize += stateIndicator.getMarshalledSize();
-   marshalSize += 1;  // padding2
-   marshalSize += 4;  // leftAzimuth
-   marshalSize += 4;  // rightAzimuth
-   marshalSize += 4;  // lowerElevation
-   marshalSize += 4;  // upperElevation
-   marshalSize += 4;  // residualPower
-   marshalSize += 8;  // padding3
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link BlankingSector#recordType}*/
-public BlankingSector setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link BlankingSector#recordLength}*/
-public BlankingSector setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link BlankingSector#padding}*/
-public BlankingSector setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link BlankingSector#emitterNumber}*/
-public BlankingSector setEmitterNumber(byte pEmitterNumber)
-{
-    emitterNumber = pEmitterNumber;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#emitterNumber}*/
-public byte getEmitterNumber()
-{
-    return emitterNumber; 
-}
-
-/** Setter for {@link BlankingSector#beamNumber}*/
-public BlankingSector setBeamNumber(byte pBeamNumber)
-{
-    beamNumber = pBeamNumber;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#beamNumber}*/
-public byte getBeamNumber()
-{
-    return beamNumber; 
-}
-
-/** Setter for {@link BlankingSector#stateIndicator}*/
-public BlankingSector setStateIndicator(EEAttributeStateIndicator pStateIndicator)
-{
-    stateIndicator = pStateIndicator;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#stateIndicator}*/
-public EEAttributeStateIndicator getStateIndicator()
-{
-    return stateIndicator; 
-}
-
-/** Setter for {@link BlankingSector#padding2}*/
-public BlankingSector setPadding2(byte pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#padding2}*/
-public byte getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link BlankingSector#leftAzimuth}*/
-public BlankingSector setLeftAzimuth(float pLeftAzimuth)
-{
-    leftAzimuth = pLeftAzimuth;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#leftAzimuth}*/
-public float getLeftAzimuth()
-{
-    return leftAzimuth; 
-}
-
-/** Setter for {@link BlankingSector#rightAzimuth}*/
-public BlankingSector setRightAzimuth(float pRightAzimuth)
-{
-    rightAzimuth = pRightAzimuth;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#rightAzimuth}*/
-public float getRightAzimuth()
-{
-    return rightAzimuth; 
-}
-
-/** Setter for {@link BlankingSector#lowerElevation}*/
-public BlankingSector setLowerElevation(float pLowerElevation)
-{
-    lowerElevation = pLowerElevation;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#lowerElevation}*/
-public float getLowerElevation()
-{
-    return lowerElevation; 
-}
-
-/** Setter for {@link BlankingSector#upperElevation}*/
-public BlankingSector setUpperElevation(float pUpperElevation)
-{
-    upperElevation = pUpperElevation;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#upperElevation}*/
-public float getUpperElevation()
-{
-    return upperElevation; 
-}
-
-/** Setter for {@link BlankingSector#residualPower}*/
-public BlankingSector setResidualPower(float pResidualPower)
-{
-    residualPower = pResidualPower;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#residualPower}*/
-public float getResidualPower()
-{
-    return residualPower; 
-}
-
-/** Setter for {@link BlankingSector#padding3}*/
-public BlankingSector setPadding3(long pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link BlankingSector#padding3}*/
-public long getPadding3()
-{
-    return padding3; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordLength);
-       dos.writeShort(padding);
-       dos.writeByte(emitterNumber);
-       dos.writeByte(beamNumber);
-       stateIndicator.marshal(dos);
-       dos.writeByte(padding2);
-       dos.writeFloat(leftAzimuth);
-       dos.writeFloat(rightAzimuth);
-       dos.writeFloat(lowerElevation);
-       dos.writeFloat(upperElevation);
-       dos.writeFloat(residualPower);
-       dos.writeLong(padding3);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        emitterNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
-        uPosition += stateIndicator.getMarshalledSize();
-        padding2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        leftAzimuth = dis.readFloat();
-        uPosition += 4;
-        rightAzimuth = dis.readFloat();
-        uPosition += 4;
-        lowerElevation = dis.readFloat();
-        uPosition += 4;
-        upperElevation = dis.readFloat();
-        uPosition += 4;
-        residualPower = dis.readFloat();
-        uPosition += 4;
-        padding3 = dis.readLong();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)padding);
-   buff.put( (byte)emitterNumber);
-   buff.put( (byte)beamNumber);
-   stateIndicator.marshal(buff);
-   buff.put( (byte)padding2);
-   buff.putFloat( (float)leftAzimuth);
-   buff.putFloat( (float)rightAzimuth);
-   buff.putFloat( (float)lowerElevation);
-   buff.putFloat( (float)upperElevation);
-   buff.putFloat( (float)residualPower);
-   buff.putLong( (long)padding3);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    emitterNumber = (byte)(buff.get() & 0xFF);
-    beamNumber = (byte)(buff.get() & 0xFF);
-    stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
-    padding2 = (byte)(buff.get() & 0xFF);
-    leftAzimuth = buff.getFloat();
-    rightAzimuth = buff.getFloat();
-    lowerElevation = buff.getFloat();
-    upperElevation = buff.getFloat();
-    residualPower = buff.getFloat();
-    padding3 = buff.getLong();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final BlankingSector rhs = (BlankingSector)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
-     if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
-     if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (leftAzimuth == rhs.leftAzimuth)) ivarsEqual = false;
-     if( ! (rightAzimuth == rhs.rightAzimuth)) ivarsEqual = false;
-     if( ! (lowerElevation == rhs.lowerElevation)) ivarsEqual = false;
-     if( ! (upperElevation == rhs.upperElevation)) ivarsEqual = false;
-     if( ! (residualPower == rhs.residualPower)) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
-    sb.append(" beamNumber: ").append(beamNumber).append("\n");
-    sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" leftAzimuth: ").append(leftAzimuth).append("\n");
-    sb.append(" rightAzimuth: ").append(rightAzimuth).append("\n");
-    sb.append(" lowerElevation: ").append(lowerElevation).append("\n");
-    sb.append(" upperElevation: ").append(upperElevation).append("\n");
-    sb.append(" residualPower: ").append(residualPower).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Category.java b/src-generated/edu/nps/moves/dis7/Category.java
deleted file mode 100644
index d211d9d21bf88f9ad037a1b14d3d7594ab382a3e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Category.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-/**
- * Category.java created on May 7, 2019
- * Marker interface to polymorphize category field in Pdus
- */
-public interface Category
-{
-    /**
-     * 
-     * @return the value of this SubCategory
-     */
-    int getValue();
-    
-    /**
-     * 
-     * @return the description of this SubCategory
-     */
-    String getDescription();
-}
diff --git a/src-generated/edu/nps/moves/dis7/ChangeOptions.java b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
deleted file mode 100644
index ab888e68dd13aaaf2ec578a92a54e4ea4f259cbc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ChangeOptions.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * This is a bitfield . See section 6.2.13 aka B.2.41
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ChangeOptions extends Object implements Serializable
-{
-   protected byte  value;
-
-
-/** Constructor */
- public ChangeOptions()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // value
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ChangeOptions#value}*/
-public ChangeOptions setValue(byte pValue)
-{
-    value = pValue;
-    return this;
-}
-
-/** Getter for {@link ChangeOptions#value}*/
-public byte getValue()
-{
-    return value; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(value);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        value = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)value);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    value = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ChangeOptions rhs = (ChangeOptions)obj;
-
-     if( ! (value == rhs.value)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" value: ").append(value).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ClockTime.java b/src-generated/edu/nps/moves/dis7/ClockTime.java
deleted file mode 100644
index 313f4f57128d809aa19718cc221a5e9d6021d0aa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ClockTime.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.14
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ClockTime extends Object implements Serializable
-{
-   /** Hours in UTC */
-   protected int  hour;
-
-   /** Time past the hour */
-   protected int  timePastHour;
-
-
-/** Constructor */
- public ClockTime()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // hour
-   marshalSize += 4;  // timePastHour
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ClockTime#hour}*/
-public ClockTime setHour(int pHour)
-{
-    hour = pHour;
-    return this;
-}
-
-/** Getter for {@link ClockTime#hour}*/
-public int getHour()
-{
-    return hour; 
-}
-
-/** Setter for {@link ClockTime#timePastHour}*/
-public ClockTime setTimePastHour(int pTimePastHour)
-{
-    timePastHour = pTimePastHour;
-    return this;
-}
-
-/** Getter for {@link ClockTime#timePastHour}*/
-public int getTimePastHour()
-{
-    return timePastHour; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(hour);
-       dos.writeInt(timePastHour);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        hour = dis.readInt();
-        uPosition += 4;
-        timePastHour = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)hour);
-   buff.putInt( (int)timePastHour);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    hour = buff.getInt();
-    timePastHour = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ClockTime rhs = (ClockTime)obj;
-
-     if( ! (hour == rhs.hour)) ivarsEqual = false;
-     if( ! (timePastHour == rhs.timePastHour)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" hour: ").append(hour).append("\n");
-    sb.append(" timePastHour: ").append(timePastHour).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
deleted file mode 100644
index 48a09601d782155e35b75e477ee8d5ae95cb5095..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.4 Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. See 5.3.4.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CollisionElasticPdu extends EntityInformationFamilyPdu implements Serializable
-{
-   /** This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28) */
-   protected EntityID  issuingEntityID = new EntityID(); 
-
-   /** This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28). */
-   protected EntityID  collidingEntityID = new EntityID(); 
-
-   /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */
-   protected EventIdentifier  collisionEventID = new EventIdentifier(); 
-
-   /** some padding */
-   protected short  pad = (short)0;
-
-   /** This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)] */
-   protected Vector3Float  contactVelocity = new Vector3Float(); 
-
-   /** This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms */
-   protected float  mass;
-
-   /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
-   protected Vector3Float  locationOfImpact = new Vector3Float(); 
-
-   /** These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4) */
-   protected float  collisionIntermediateResultXX;
-
-   /** tensor values */
-   protected float  collisionIntermediateResultXY;
-
-   /** tensor values */
-   protected float  collisionIntermediateResultXZ;
-
-   /** tensor values */
-   protected float  collisionIntermediateResultYY;
-
-   /** tensor values */
-   protected float  collisionIntermediateResultYZ;
-
-   /** tensor values */
-   protected float  collisionIntermediateResultZZ;
-
-   /** This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
-   protected Vector3Float  unitSurfaceNormal = new Vector3Float(); 
-
-   /** This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may "tune" their collision interactions. */
-   protected float  coefficientOfRestitution;
-
-
-/** Constructor */
- public CollisionElasticPdu()
- {
-    setPduType( DISPDUType.COLLISION_ELASTIC );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += issuingEntityID.getMarshalledSize();
-   marshalSize += collidingEntityID.getMarshalledSize();
-   marshalSize += collisionEventID.getMarshalledSize();
-   marshalSize += 2;  // pad
-   marshalSize += contactVelocity.getMarshalledSize();
-   marshalSize += 4;  // mass
-   marshalSize += locationOfImpact.getMarshalledSize();
-   marshalSize += 4;  // collisionIntermediateResultXX
-   marshalSize += 4;  // collisionIntermediateResultXY
-   marshalSize += 4;  // collisionIntermediateResultXZ
-   marshalSize += 4;  // collisionIntermediateResultYY
-   marshalSize += 4;  // collisionIntermediateResultYZ
-   marshalSize += 4;  // collisionIntermediateResultZZ
-   marshalSize += unitSurfaceNormal.getMarshalledSize();
-   marshalSize += 4;  // coefficientOfRestitution
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CollisionElasticPdu#issuingEntityID}*/
-public CollisionElasticPdu setIssuingEntityID(EntityID pIssuingEntityID)
-{
-    issuingEntityID = pIssuingEntityID;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#issuingEntityID}*/
-public EntityID getIssuingEntityID()
-{
-    return issuingEntityID; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collidingEntityID}*/
-public CollisionElasticPdu setCollidingEntityID(EntityID pCollidingEntityID)
-{
-    collidingEntityID = pCollidingEntityID;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collidingEntityID}*/
-public EntityID getCollidingEntityID()
-{
-    return collidingEntityID; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionEventID}*/
-public CollisionElasticPdu setCollisionEventID(EventIdentifier pCollisionEventID)
-{
-    collisionEventID = pCollisionEventID;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionEventID}*/
-public EventIdentifier getCollisionEventID()
-{
-    return collisionEventID; 
-}
-
-/** Setter for {@link CollisionElasticPdu#pad}*/
-public CollisionElasticPdu setPad(short pPad)
-{
-    pad = pPad;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#pad}*/
-public short getPad()
-{
-    return pad; 
-}
-
-/** Setter for {@link CollisionElasticPdu#contactVelocity}*/
-public CollisionElasticPdu setContactVelocity(Vector3Float pContactVelocity)
-{
-    contactVelocity = pContactVelocity;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#contactVelocity}*/
-public Vector3Float getContactVelocity()
-{
-    return contactVelocity; 
-}
-
-/** Setter for {@link CollisionElasticPdu#mass}*/
-public CollisionElasticPdu setMass(float pMass)
-{
-    mass = pMass;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#mass}*/
-public float getMass()
-{
-    return mass; 
-}
-
-/** Setter for {@link CollisionElasticPdu#locationOfImpact}*/
-public CollisionElasticPdu setLocationOfImpact(Vector3Float pLocationOfImpact)
-{
-    locationOfImpact = pLocationOfImpact;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#locationOfImpact}*/
-public Vector3Float getLocationOfImpact()
-{
-    return locationOfImpact; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXX}*/
-public CollisionElasticPdu setCollisionIntermediateResultXX(float pCollisionIntermediateResultXX)
-{
-    collisionIntermediateResultXX = pCollisionIntermediateResultXX;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXX}*/
-public float getCollisionIntermediateResultXX()
-{
-    return collisionIntermediateResultXX; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXY}*/
-public CollisionElasticPdu setCollisionIntermediateResultXY(float pCollisionIntermediateResultXY)
-{
-    collisionIntermediateResultXY = pCollisionIntermediateResultXY;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXY}*/
-public float getCollisionIntermediateResultXY()
-{
-    return collisionIntermediateResultXY; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXZ}*/
-public CollisionElasticPdu setCollisionIntermediateResultXZ(float pCollisionIntermediateResultXZ)
-{
-    collisionIntermediateResultXZ = pCollisionIntermediateResultXZ;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXZ}*/
-public float getCollisionIntermediateResultXZ()
-{
-    return collisionIntermediateResultXZ; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultYY}*/
-public CollisionElasticPdu setCollisionIntermediateResultYY(float pCollisionIntermediateResultYY)
-{
-    collisionIntermediateResultYY = pCollisionIntermediateResultYY;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultYY}*/
-public float getCollisionIntermediateResultYY()
-{
-    return collisionIntermediateResultYY; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultYZ}*/
-public CollisionElasticPdu setCollisionIntermediateResultYZ(float pCollisionIntermediateResultYZ)
-{
-    collisionIntermediateResultYZ = pCollisionIntermediateResultYZ;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultYZ}*/
-public float getCollisionIntermediateResultYZ()
-{
-    return collisionIntermediateResultYZ; 
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultZZ}*/
-public CollisionElasticPdu setCollisionIntermediateResultZZ(float pCollisionIntermediateResultZZ)
-{
-    collisionIntermediateResultZZ = pCollisionIntermediateResultZZ;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultZZ}*/
-public float getCollisionIntermediateResultZZ()
-{
-    return collisionIntermediateResultZZ; 
-}
-
-/** Setter for {@link CollisionElasticPdu#unitSurfaceNormal}*/
-public CollisionElasticPdu setUnitSurfaceNormal(Vector3Float pUnitSurfaceNormal)
-{
-    unitSurfaceNormal = pUnitSurfaceNormal;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#unitSurfaceNormal}*/
-public Vector3Float getUnitSurfaceNormal()
-{
-    return unitSurfaceNormal; 
-}
-
-/** Setter for {@link CollisionElasticPdu#coefficientOfRestitution}*/
-public CollisionElasticPdu setCoefficientOfRestitution(float pCoefficientOfRestitution)
-{
-    coefficientOfRestitution = pCoefficientOfRestitution;
-    return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#coefficientOfRestitution}*/
-public float getCoefficientOfRestitution()
-{
-    return coefficientOfRestitution; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       issuingEntityID.marshal(dos);
-       collidingEntityID.marshal(dos);
-       collisionEventID.marshal(dos);
-       dos.writeShort(pad);
-       contactVelocity.marshal(dos);
-       dos.writeFloat(mass);
-       locationOfImpact.marshal(dos);
-       dos.writeFloat(collisionIntermediateResultXX);
-       dos.writeFloat(collisionIntermediateResultXY);
-       dos.writeFloat(collisionIntermediateResultXZ);
-       dos.writeFloat(collisionIntermediateResultYY);
-       dos.writeFloat(collisionIntermediateResultYZ);
-       dos.writeFloat(collisionIntermediateResultZZ);
-       unitSurfaceNormal.marshal(dos);
-       dos.writeFloat(coefficientOfRestitution);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += issuingEntityID.unmarshal(dis);
-        uPosition += collidingEntityID.unmarshal(dis);
-        uPosition += collisionEventID.unmarshal(dis);
-        pad = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += contactVelocity.unmarshal(dis);
-        mass = dis.readFloat();
-        uPosition += 4;
-        uPosition += locationOfImpact.unmarshal(dis);
-        collisionIntermediateResultXX = dis.readFloat();
-        uPosition += 4;
-        collisionIntermediateResultXY = dis.readFloat();
-        uPosition += 4;
-        collisionIntermediateResultXZ = dis.readFloat();
-        uPosition += 4;
-        collisionIntermediateResultYY = dis.readFloat();
-        uPosition += 4;
-        collisionIntermediateResultYZ = dis.readFloat();
-        uPosition += 4;
-        collisionIntermediateResultZZ = dis.readFloat();
-        uPosition += 4;
-        uPosition += unitSurfaceNormal.unmarshal(dis);
-        coefficientOfRestitution = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   issuingEntityID.marshal(buff);
-   collidingEntityID.marshal(buff);
-   collisionEventID.marshal(buff);
-   buff.putShort( (short)pad);
-   contactVelocity.marshal(buff);
-   buff.putFloat( (float)mass);
-   locationOfImpact.marshal(buff);
-   buff.putFloat( (float)collisionIntermediateResultXX);
-   buff.putFloat( (float)collisionIntermediateResultXY);
-   buff.putFloat( (float)collisionIntermediateResultXZ);
-   buff.putFloat( (float)collisionIntermediateResultYY);
-   buff.putFloat( (float)collisionIntermediateResultYZ);
-   buff.putFloat( (float)collisionIntermediateResultZZ);
-   unitSurfaceNormal.marshal(buff);
-   buff.putFloat( (float)coefficientOfRestitution);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    issuingEntityID.unmarshal(buff);
-    collidingEntityID.unmarshal(buff);
-    collisionEventID.unmarshal(buff);
-    pad = (short)(buff.getShort() & 0xFFFF);
-    contactVelocity.unmarshal(buff);
-    mass = buff.getFloat();
-    locationOfImpact.unmarshal(buff);
-    collisionIntermediateResultXX = buff.getFloat();
-    collisionIntermediateResultXY = buff.getFloat();
-    collisionIntermediateResultXZ = buff.getFloat();
-    collisionIntermediateResultYY = buff.getFloat();
-    collisionIntermediateResultYZ = buff.getFloat();
-    collisionIntermediateResultZZ = buff.getFloat();
-    unitSurfaceNormal.unmarshal(buff);
-    coefficientOfRestitution = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CollisionElasticPdu rhs = (CollisionElasticPdu)obj;
-
-     if( ! (issuingEntityID.equals( rhs.issuingEntityID) )) ivarsEqual = false;
-     if( ! (collidingEntityID.equals( rhs.collidingEntityID) )) ivarsEqual = false;
-     if( ! (collisionEventID.equals( rhs.collisionEventID) )) ivarsEqual = false;
-     if( ! (pad == rhs.pad)) ivarsEqual = false;
-     if( ! (contactVelocity.equals( rhs.contactVelocity) )) ivarsEqual = false;
-     if( ! (mass == rhs.mass)) ivarsEqual = false;
-     if( ! (locationOfImpact.equals( rhs.locationOfImpact) )) ivarsEqual = false;
-     if( ! (collisionIntermediateResultXX == rhs.collisionIntermediateResultXX)) ivarsEqual = false;
-     if( ! (collisionIntermediateResultXY == rhs.collisionIntermediateResultXY)) ivarsEqual = false;
-     if( ! (collisionIntermediateResultXZ == rhs.collisionIntermediateResultXZ)) ivarsEqual = false;
-     if( ! (collisionIntermediateResultYY == rhs.collisionIntermediateResultYY)) ivarsEqual = false;
-     if( ! (collisionIntermediateResultYZ == rhs.collisionIntermediateResultYZ)) ivarsEqual = false;
-     if( ! (collisionIntermediateResultZZ == rhs.collisionIntermediateResultZZ)) ivarsEqual = false;
-     if( ! (unitSurfaceNormal.equals( rhs.unitSurfaceNormal) )) ivarsEqual = false;
-     if( ! (coefficientOfRestitution == rhs.coefficientOfRestitution)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
-    sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
-    sb.append(" collisionEventID: ").append(collisionEventID).append("\n");
-    sb.append(" pad: ").append(pad).append("\n");
-    sb.append(" contactVelocity: ").append(contactVelocity).append("\n");
-    sb.append(" mass: ").append(mass).append("\n");
-    sb.append(" locationOfImpact: ").append(locationOfImpact).append("\n");
-    sb.append(" collisionIntermediateResultXX: ").append(collisionIntermediateResultXX).append("\n");
-    sb.append(" collisionIntermediateResultXY: ").append(collisionIntermediateResultXY).append("\n");
-    sb.append(" collisionIntermediateResultXZ: ").append(collisionIntermediateResultXZ).append("\n");
-    sb.append(" collisionIntermediateResultYY: ").append(collisionIntermediateResultYY).append("\n");
-    sb.append(" collisionIntermediateResultYZ: ").append(collisionIntermediateResultYZ).append("\n");
-    sb.append(" collisionIntermediateResultZZ: ").append(collisionIntermediateResultZZ).append("\n");
-    sb.append(" unitSurfaceNormal: ").append(unitSurfaceNormal).append("\n");
-    sb.append(" coefficientOfRestitution: ").append(coefficientOfRestitution).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CollisionPdu.java b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
deleted file mode 100644
index bce68636ccb068724d9807e57fb7fba8c5f94852..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CollisionPdu.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. See 5.3.3.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CollisionPdu extends EntityInformationFamilyPdu implements Serializable
-{
-   /** This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */
-   protected EntityID  issuingEntityID = new EntityID(); 
-
-   /** This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28). */
-   protected EntityID  collidingEntityID = new EntityID(); 
-
-   /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations uid 189 */
-   protected CollisionType collisionType = CollisionType.values()[0];
-
-   /** some padding */
-   protected byte  pad = (byte)0;
-
-   /** This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]. */
-   protected Vector3Float  velocity = new Vector3Float(); 
-
-   /** This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms. */
-   protected float  mass;
-
-   /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
-   protected Vector3Float  location = new Vector3Float(); 
-
-
-/** Constructor */
- public CollisionPdu()
- {
-    setPduType( DISPDUType.COLLISION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += issuingEntityID.getMarshalledSize();
-   marshalSize += collidingEntityID.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += collisionType.getMarshalledSize();
-   marshalSize += 1;  // pad
-   marshalSize += velocity.getMarshalledSize();
-   marshalSize += 4;  // mass
-   marshalSize += location.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CollisionPdu#issuingEntityID}*/
-public CollisionPdu setIssuingEntityID(EntityID pIssuingEntityID)
-{
-    issuingEntityID = pIssuingEntityID;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#issuingEntityID}*/
-public EntityID getIssuingEntityID()
-{
-    return issuingEntityID; 
-}
-
-/** Setter for {@link CollisionPdu#collidingEntityID}*/
-public CollisionPdu setCollidingEntityID(EntityID pCollidingEntityID)
-{
-    collidingEntityID = pCollidingEntityID;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#collidingEntityID}*/
-public EntityID getCollidingEntityID()
-{
-    return collidingEntityID; 
-}
-
-/** Setter for {@link CollisionPdu#eventID}*/
-public CollisionPdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link CollisionPdu#collisionType}*/
-public CollisionPdu setCollisionType(CollisionType pCollisionType)
-{
-    collisionType = pCollisionType;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#collisionType}*/
-public CollisionType getCollisionType()
-{
-    return collisionType; 
-}
-
-/** Setter for {@link CollisionPdu#pad}*/
-public CollisionPdu setPad(byte pPad)
-{
-    pad = pPad;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#pad}*/
-public byte getPad()
-{
-    return pad; 
-}
-
-/** Setter for {@link CollisionPdu#velocity}*/
-public CollisionPdu setVelocity(Vector3Float pVelocity)
-{
-    velocity = pVelocity;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#velocity}*/
-public Vector3Float getVelocity()
-{
-    return velocity; 
-}
-
-/** Setter for {@link CollisionPdu#mass}*/
-public CollisionPdu setMass(float pMass)
-{
-    mass = pMass;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#mass}*/
-public float getMass()
-{
-    return mass; 
-}
-
-/** Setter for {@link CollisionPdu#location}*/
-public CollisionPdu setLocation(Vector3Float pLocation)
-{
-    location = pLocation;
-    return this;
-}
-
-/** Getter for {@link CollisionPdu#location}*/
-public Vector3Float getLocation()
-{
-    return location; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       issuingEntityID.marshal(dos);
-       collidingEntityID.marshal(dos);
-       eventID.marshal(dos);
-       collisionType.marshal(dos);
-       dos.writeByte(pad);
-       velocity.marshal(dos);
-       dos.writeFloat(mass);
-       location.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += issuingEntityID.unmarshal(dis);
-        uPosition += collidingEntityID.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        collisionType = CollisionType.unmarshalEnum(dis);
-        uPosition += collisionType.getMarshalledSize();
-        pad = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += velocity.unmarshal(dis);
-        mass = dis.readFloat();
-        uPosition += 4;
-        uPosition += location.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   issuingEntityID.marshal(buff);
-   collidingEntityID.marshal(buff);
-   eventID.marshal(buff);
-   collisionType.marshal(buff);
-   buff.put( (byte)pad);
-   velocity.marshal(buff);
-   buff.putFloat( (float)mass);
-   location.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    issuingEntityID.unmarshal(buff);
-    collidingEntityID.unmarshal(buff);
-    eventID.unmarshal(buff);
-    collisionType = CollisionType.unmarshalEnum(buff);
-    pad = (byte)(buff.get() & 0xFF);
-    velocity.unmarshal(buff);
-    mass = buff.getFloat();
-    location.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CollisionPdu rhs = (CollisionPdu)obj;
-
-     if( ! (issuingEntityID.equals( rhs.issuingEntityID) )) ivarsEqual = false;
-     if( ! (collidingEntityID.equals( rhs.collidingEntityID) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (collisionType == rhs.collisionType)) ivarsEqual = false;
-     if( ! (pad == rhs.pad)) ivarsEqual = false;
-     if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-     if( ! (mass == rhs.mass)) ivarsEqual = false;
-     if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
-    sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" collisionType: ").append(collisionType).append("\n");
-    sb.append(" pad: ").append(pad).append("\n");
-    sb.append(" velocity: ").append(velocity).append("\n");
-    sb.append(" mass: ").append(mass).append("\n");
-    sb.append(" location: ").append(location).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentPdu.java b/src-generated/edu/nps/moves/dis7/CommentPdu.java
deleted file mode 100644
index a247c2a13bf9f3eb3916d7b1d24cbb83cc506957..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CommentPdu.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.13 Used to enter arbitrary messages (character strings, for example). See 5.6.5.13
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CommentPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** Number of fixed datum records, not used in this Pdu */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public CommentPdu()
- {
-    setPduType( DISPDUType.COMMENT );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CommentPdu#variableDatums}*/
-public CommentPdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link CommentPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(numberOfFixedDatumRecords);
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)numberOfFixedDatumRecords);
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CommentPdu rhs = (CommentPdu)obj;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentRPdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
deleted file mode 100644
index 86ebae65faca325460f4269b6e6bb5d12bc5b5a7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CommentRPdu.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.13 Serves the same function as the Comment PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CommentRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** Fixed datum record count, not used in this Pdu */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public CommentRPdu()
- {
-    setPduType( DISPDUType.COMMENT_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CommentRPdu#variableDatumRecords}*/
-public CommentRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link CommentRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(numberOfFixedDatumRecords);
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)numberOfFixedDatumRecords);
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CommentRPdu rhs = (CommentRPdu)obj;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
deleted file mode 100644
index 3c27f85b5ebcc217773ed283d97a1b2a042af4df..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a CommentRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CommentReliablePdu extends CommentRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
deleted file mode 100644
index 7432bcc57459ed5ec9d8a6a89872d209b146116a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identity of a communications node. Section 6.2.48.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CommunicationsNodeID extends Object implements Serializable
-{
-   protected EntityID  entityID = new EntityID(); 
-
-   protected short  elementID;
-
-
-/** Constructor */
- public CommunicationsNodeID()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityID.getMarshalledSize();
-   marshalSize += 2;  // elementID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CommunicationsNodeID#entityID}*/
-public CommunicationsNodeID setEntityID(EntityID pEntityID)
-{
-    entityID = pEntityID;
-    return this;
-}
-
-/** Getter for {@link CommunicationsNodeID#entityID}*/
-public EntityID getEntityID()
-{
-    return entityID; 
-}
-
-/** Setter for {@link CommunicationsNodeID#elementID}*/
-public CommunicationsNodeID setElementID(short pElementID)
-{
-    elementID = pElementID;
-    return this;
-}
-
-/** Getter for {@link CommunicationsNodeID#elementID}*/
-public short getElementID()
-{
-    return elementID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityID.marshal(dos);
-       dos.writeShort(elementID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += entityID.unmarshal(dis);
-        elementID = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityID.marshal(buff);
-   buff.putShort( (short)elementID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityID.unmarshal(buff);
-    elementID = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CommunicationsNodeID rhs = (CommunicationsNodeID)obj;
-
-     if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
-     if( ! (elementID == rhs.elementID)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityID: ").append(entityID).append("\n");
-    sb.append(" elementID: ").append(elementID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
deleted file mode 100644
index d593738a5fd1c72cc56e85978177f4699bb39959..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.2. Create a new entity. See 5.6.5.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CreateEntityPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** Identifier for the request.  See 6.2.75 */
-   protected int  requestID;
-
-
-/** Constructor */
- public CreateEntityPdu()
- {
-    setPduType( DISPDUType.CREATE_ENTITY );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CreateEntityPdu#requestID}*/
-public CreateEntityPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link CreateEntityPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CreateEntityPdu rhs = (CreateEntityPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
deleted file mode 100644
index f1dce4b3c35cfbf9cd23c9d58d0925e95728fcaf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.2 Serves the same function as the Create Entity PDU but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CreateEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   protected byte  pad1;
-
-   protected short  pad2;
-
-   /** Request ID */
-   protected int  requestID;
-
-
-/** Constructor */
- public CreateEntityRPdu()
- {
-    setPduType( DISPDUType.CREATE_ENTITY_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link CreateEntityRPdu#requiredReliabilityService}*/
-public CreateEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link CreateEntityRPdu#pad1}*/
-public CreateEntityRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link CreateEntityRPdu#pad2}*/
-public CreateEntityRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link CreateEntityRPdu#requestID}*/
-public CreateEntityRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final CreateEntityRPdu rhs = (CreateEntityRPdu)obj;
-
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
deleted file mode 100644
index 7f961af72c67fe1c83b4d34a5f8bc18141012c9b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a CreateEntityRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class CreateEntityReliablePdu extends CreateEntityRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
deleted file mode 100644
index 75e77b67602645fb94d827e6b9e015bf21c50cf3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * identify which of the optional data fields are contained in the Minefield Data PDU or requested in the Minefield Query PDU. This is a 32-bit record. For each field, true denotes that the data is requested or present and false denotes that the data is neither requested nor present. Section 6.2.16
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataFilterRecord extends Object implements Serializable
-{
-   /** Bitflags field */
-   protected int  bitFlags;
-
-   public static int  GROUND_BURIAL_DEPTH_OFFSET_BIT = 0;
-   public static int  WATER_BURIAL_DEPTH_OFFSET_BIT = 1;
-   public static int  SNOW_BURIAL_DEPTH_OFFSET_BIT = 2;
-   public static int  MINE_ORIENTATION_BIT = 3;
-   public static int  THERMAL_CONSTRAST_BIT = 4;
-   public static int  REFLECTANCE_BIT = 5;
-   public static int  MINE_EMPLACEMENT_TIME_BIT = 6;
-   public static int  TRIP_DETONATION_WIRE_BIT = 7;
-   public static int  FUSING_BIT = 8;
-   public static int  SCALAR_DETECTION_COEFFICIENT_BIT = 9;
-   public static int  PAINT_SCHEME_BIT = 10;
-
-/** Constructor */
- public DataFilterRecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // bitFlags
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DataFilterRecord#bitFlags}*/
-public DataFilterRecord setBitFlags(int pBitFlags)
-{
-    bitFlags = pBitFlags;
-    return this;
-}
-
-/** Getter for {@link DataFilterRecord#bitFlags}*/
-public int getBitFlags()
-{
-    return bitFlags; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(bitFlags);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        bitFlags = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)bitFlags);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    bitFlags = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DataFilterRecord rhs = (DataFilterRecord)obj;
-
-     if( ! (bitFlags == rhs.bitFlags)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" bitFlags: ").append(bitFlags).append("\n");
-    sb.append(" GROUND_BURIAL_DEPTH_OFFSET_BIT: ").append(GROUND_BURIAL_DEPTH_OFFSET_BIT).append("\n");
-    sb.append(" WATER_BURIAL_DEPTH_OFFSET_BIT: ").append(WATER_BURIAL_DEPTH_OFFSET_BIT).append("\n");
-    sb.append(" SNOW_BURIAL_DEPTH_OFFSET_BIT: ").append(SNOW_BURIAL_DEPTH_OFFSET_BIT).append("\n");
-    sb.append(" MINE_ORIENTATION_BIT: ").append(MINE_ORIENTATION_BIT).append("\n");
-    sb.append(" THERMAL_CONSTRAST_BIT: ").append(THERMAL_CONSTRAST_BIT).append("\n");
-    sb.append(" REFLECTANCE_BIT: ").append(REFLECTANCE_BIT).append("\n");
-    sb.append(" MINE_EMPLACEMENT_TIME_BIT: ").append(MINE_EMPLACEMENT_TIME_BIT).append("\n");
-    sb.append(" TRIP_DETONATION_WIRE_BIT: ").append(TRIP_DETONATION_WIRE_BIT).append("\n");
-    sb.append(" FUSING_BIT: ").append(FUSING_BIT).append("\n");
-    sb.append(" SCALAR_DETECTION_COEFFICIENT_BIT: ").append(SCALAR_DETECTION_COEFFICIENT_BIT).append("\n");
-    sb.append(" PAINT_SCHEME_BIT: ").append(PAINT_SCHEME_BIT).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataPdu.java b/src-generated/edu/nps/moves/dis7/DataPdu.java
deleted file mode 100644
index 735ab6d7155c1b236e4a77d724a48d9c1aa8ed73..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.11 Information issued in response to a Data Query PDU or Set Data PDU. Section 5.6.5.11
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** ID of request */
-   protected int  requestID;
-
-   /** padding */
-   protected int  padding1 = (int)0;
-
-   /** Number of fixed datum records */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variable length list of fixed datums */
-   protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
- 
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public DataPdu()
- {
-    setPduType( DISPDUType.DATA );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += 4;  // padding1
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DataPdu#requestID}*/
-public DataPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link DataPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link DataPdu#padding1}*/
-public DataPdu setPadding1(int pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link DataPdu#padding1}*/
-public int getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link DataPdu#fixedDatums}*/
-public DataPdu setFixedDatums(List<FixedDatum> pFixedDatums)
-{
-    fixedDatums = pFixedDatums;
-    return this;
-}
-
-/** Getter for {@link DataPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
-{
-    return fixedDatums; 
-}
-
-/** Setter for {@link DataPdu#variableDatums}*/
-public DataPdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link DataPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       dos.writeInt(padding1);
-       dos.writeInt(fixedDatums.size());
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < fixedDatums.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatums.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        padding1 = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatums.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   buff.putInt( (int)padding1);
-   buff.putInt( (int)fixedDatums.size());
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatums.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    padding1 = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatums.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DataPdu rhs = (DataPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatums.size(); idx++)
-        if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" fixedDatums: ").append("\n");
-    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
deleted file mode 100644
index 40e90b1ead9cb884034090e3321e40fff2933cec..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * List of fixed and variable datum records. Section 6.2.17 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataQueryDatumSpecification extends Object implements Serializable
-{
-   /** Number of fixed datums */
-   protected int  numberOfFixedDatums;
-
-   /** Number of variable datums */
-   protected int  numberOfVariableDatums;
-
-   /** variable length list fixed datum IDs */
-   protected List< UnsignedDISInteger > fixedDatumIDList = new ArrayList< UnsignedDISInteger >();
- 
-   /** variable length list variable datum IDs */
-   protected List< UnsignedDISInteger > variableDatumIDList = new ArrayList< UnsignedDISInteger >();
- 
-
-/** Constructor */
- public DataQueryDatumSpecification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // numberOfFixedDatums
-   marshalSize += 4;  // numberOfVariableDatums
-   for(int idx=0; idx < fixedDatumIDList.size(); idx++)
-   {
-        UnsignedDISInteger listElement = fixedDatumIDList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumIDList.size(); idx++)
-   {
-        UnsignedDISInteger listElement = variableDatumIDList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DataQueryDatumSpecification#fixedDatumIDList}*/
-public DataQueryDatumSpecification setFixedDatumIDList(List<UnsignedDISInteger> pFixedDatumIDList)
-{
-    fixedDatumIDList = pFixedDatumIDList;
-    return this;
-}
-
-/** Getter for {@link DataQueryDatumSpecification#fixedDatumIDList}*/
-public List<UnsignedDISInteger> getFixedDatumIDList()
-{
-    return fixedDatumIDList; 
-}
-
-/** Setter for {@link DataQueryDatumSpecification#variableDatumIDList}*/
-public DataQueryDatumSpecification setVariableDatumIDList(List<UnsignedDISInteger> pVariableDatumIDList)
-{
-    variableDatumIDList = pVariableDatumIDList;
-    return this;
-}
-
-/** Getter for {@link DataQueryDatumSpecification#variableDatumIDList}*/
-public List<UnsignedDISInteger> getVariableDatumIDList()
-{
-    return variableDatumIDList; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(fixedDatumIDList.size());
-       dos.writeInt(variableDatumIDList.size());
-
-       for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
-       {
-            UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
-            aUnsignedDISInteger.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumIDList.size(); idx++)
-       {
-            UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
-            aUnsignedDISInteger.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfFixedDatums = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatums = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatums; idx++)
-        {
-            UnsignedDISInteger anX = new UnsignedDISInteger();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumIDList.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatums; idx++)
-        {
-            UnsignedDISInteger anX = new UnsignedDISInteger();
-            uPosition += anX.unmarshal(dis);
-            variableDatumIDList.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)fixedDatumIDList.size());
-   buff.putInt( (int)variableDatumIDList.size());
-
-   for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
-   {
-        UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
-        aUnsignedDISInteger.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumIDList.size(); idx++)
-   {
-        UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
-        aUnsignedDISInteger.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfFixedDatums = buff.getInt();
-    numberOfVariableDatums = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatums; idx++)
-    {
-    UnsignedDISInteger anX = new UnsignedDISInteger();
-    anX.unmarshal(buff);
-    fixedDatumIDList.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatums; idx++)
-    {
-    UnsignedDISInteger anX = new UnsignedDISInteger();
-    anX.unmarshal(buff);
-    variableDatumIDList.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DataQueryDatumSpecification rhs = (DataQueryDatumSpecification)obj;
-
-
-     for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
-        if( ! ( fixedDatumIDList.get(idx).equals(rhs.fixedDatumIDList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumIDList.size(); idx++)
-        if( ! ( variableDatumIDList.get(idx).equals(rhs.variableDatumIDList.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fixedDatumIDList: ").append("\n");
-    fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumIDList: ").append("\n");
-    variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
deleted file mode 100644
index 41a3a69ae5bd62c9543b7697e198849111720cfb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.9. Request for data from an entity. See 5.6.5.9
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataQueryPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** ID of request */
-   protected int  requestID;
-
-   /** time issues between issues of Data PDUs. Zero means send once only. */
-   protected int  timeInterval;
-
-   /** Number of fixed datum records */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variable length list of fixed datums */
-   protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
- 
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public DataQueryPdu()
- {
-    setPduType( DISPDUType.DATA_QUERY );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += 4;  // timeInterval
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DataQueryPdu#requestID}*/
-public DataQueryPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link DataQueryPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link DataQueryPdu#timeInterval}*/
-public DataQueryPdu setTimeInterval(int pTimeInterval)
-{
-    timeInterval = pTimeInterval;
-    return this;
-}
-
-/** Getter for {@link DataQueryPdu#timeInterval}*/
-public int getTimeInterval()
-{
-    return timeInterval; 
-}
-
-/** Setter for {@link DataQueryPdu#fixedDatums}*/
-public DataQueryPdu setFixedDatums(List<FixedDatum> pFixedDatums)
-{
-    fixedDatums = pFixedDatums;
-    return this;
-}
-
-/** Getter for {@link DataQueryPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
-{
-    return fixedDatums; 
-}
-
-/** Setter for {@link DataQueryPdu#variableDatums}*/
-public DataQueryPdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link DataQueryPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       dos.writeInt(timeInterval);
-       dos.writeInt(fixedDatums.size());
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < fixedDatums.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatums.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        timeInterval = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatums.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   buff.putInt( (int)timeInterval);
-   buff.putInt( (int)fixedDatums.size());
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatums.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    timeInterval = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatums.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DataQueryPdu rhs = (DataQueryPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (timeInterval == rhs.timeInterval)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatums.size(); idx++)
-        if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" timeInterval: ").append(timeInterval).append("\n");
-    sb.append(" fixedDatums: ").append("\n");
-    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
deleted file mode 100644
index dac2d5c73dace279c8e40c138bd88823027e6c7e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.9 Serves the same function as the Data Query PDU but with the addition of reliability service levels
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   /** padding */
-   protected byte  pad1;
-
-   /** padding */
-   protected short  pad2;
-
-   /** request ID */
-   protected int  requestID;
-
-   /** time interval between issuing data query PDUs */
-   protected int  timeInterval;
-
-   /** Fixed datum record count */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Fixed datum records */
-   protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
- 
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public DataQueryRPdu()
- {
-    setPduType( DISPDUType.DATA_QUERY_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // requestID
-   marshalSize += 4;  // timeInterval
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DataQueryRPdu#requiredReliabilityService}*/
-public DataQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link DataQueryRPdu#pad1}*/
-public DataQueryRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link DataQueryRPdu#pad2}*/
-public DataQueryRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link DataQueryRPdu#requestID}*/
-public DataQueryRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link DataQueryRPdu#timeInterval}*/
-public DataQueryRPdu setTimeInterval(int pTimeInterval)
-{
-    timeInterval = pTimeInterval;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#timeInterval}*/
-public int getTimeInterval()
-{
-    return timeInterval; 
-}
-
-/** Setter for {@link DataQueryRPdu#fixedDatumRecords}*/
-public DataQueryRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
-{
-    fixedDatumRecords = pFixedDatumRecords;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
-{
-    return fixedDatumRecords; 
-}
-
-/** Setter for {@link DataQueryRPdu#variableDatumRecords}*/
-public DataQueryRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link DataQueryRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(requestID);
-       dos.writeInt(timeInterval);
-       dos.writeInt(fixedDatumRecords.size());
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-        timeInterval = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumRecords.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)requestID);
-   buff.putInt( (int)timeInterval);
-   buff.putInt( (int)fixedDatumRecords.size());
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    timeInterval = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumRecords.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DataQueryRPdu rhs = (DataQueryRPdu)obj;
-
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (timeInterval == rhs.timeInterval)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-        if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" timeInterval: ").append(timeInterval).append("\n");
-    sb.append(" fixedDatumRecords: ").append("\n");
-    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
deleted file mode 100644
index 49f4a574f9692a6ec40065af6ff0ed81785c38cc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a DataQueryRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataQueryReliablePdu extends DataQueryRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/DataRPdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
deleted file mode 100644
index 772e753f6d19b386fa286eb4cb47441793f5bdda..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataRPdu.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.11 Serves the same function as the Data PDU but with the addition of reliability service levels and is used in response to a Data Query-R PDU, a Data-R PDU, or a Set Data-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** Request ID */
-   protected int  requestID;
-
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   /** padding */
-   protected byte  pad1;
-
-   /** padding */
-   protected short  pad2;
-
-   /** Fixed datum record count */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Fixed datum records */
-   protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
- 
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public DataRPdu()
- {
-    setPduType( DISPDUType.DATA_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DataRPdu#requestID}*/
-public DataRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link DataRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link DataRPdu#requiredReliabilityService}*/
-public DataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link DataRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link DataRPdu#pad1}*/
-public DataRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link DataRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link DataRPdu#pad2}*/
-public DataRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link DataRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link DataRPdu#fixedDatumRecords}*/
-public DataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
-{
-    fixedDatumRecords = pFixedDatumRecords;
-    return this;
-}
-
-/** Getter for {@link DataRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
-{
-    return fixedDatumRecords; 
-}
-
-/** Setter for {@link DataRPdu#variableDatumRecords}*/
-public DataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link DataRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(fixedDatumRecords.size());
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumRecords.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)fixedDatumRecords.size());
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumRecords.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DataRPdu rhs = (DataRPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-        if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" fixedDatumRecords: ").append("\n");
-    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
deleted file mode 100644
index 1e539484a802634b885ff2678405e92f29ce9f5a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a DataRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DataReliablePdu extends DataRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/DatumSpecification.java b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
deleted file mode 100644
index 0af30069152a0ce5b05f215d80d243cc0cb6b873..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DatumSpecification.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * List of fixed and variable datum records. Section 6.2.18 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DatumSpecification extends Object implements Serializable
-{
-   /** Number of fixed datums */
-   protected int  numberOfFixedDatums;
-
-   /** Number of variable datums */
-   protected int  numberOfVariableDatums;
-
-   /** variable length list fixed datums */
-   protected List< FixedDatum > fixedDatumIDList = new ArrayList< FixedDatum >();
- 
-   /** variable length list variable datums */
-   protected List< VariableDatum > variableDatumIDList = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public DatumSpecification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // numberOfFixedDatums
-   marshalSize += 4;  // numberOfVariableDatums
-   for(int idx=0; idx < fixedDatumIDList.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumIDList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumIDList.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumIDList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DatumSpecification#fixedDatumIDList}*/
-public DatumSpecification setFixedDatumIDList(List<FixedDatum> pFixedDatumIDList)
-{
-    fixedDatumIDList = pFixedDatumIDList;
-    return this;
-}
-
-/** Getter for {@link DatumSpecification#fixedDatumIDList}*/
-public List<FixedDatum> getFixedDatumIDList()
-{
-    return fixedDatumIDList; 
-}
-
-/** Setter for {@link DatumSpecification#variableDatumIDList}*/
-public DatumSpecification setVariableDatumIDList(List<VariableDatum> pVariableDatumIDList)
-{
-    variableDatumIDList = pVariableDatumIDList;
-    return this;
-}
-
-/** Getter for {@link DatumSpecification#variableDatumIDList}*/
-public List<VariableDatum> getVariableDatumIDList()
-{
-    return variableDatumIDList; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(fixedDatumIDList.size());
-       dos.writeInt(variableDatumIDList.size());
-
-       for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumIDList.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumIDList.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfFixedDatums = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatums = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatums; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumIDList.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatums; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumIDList.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)fixedDatumIDList.size());
-   buff.putInt( (int)variableDatumIDList.size());
-
-   for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumIDList.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumIDList.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfFixedDatums = buff.getInt();
-    numberOfVariableDatums = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatums; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumIDList.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatums; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumIDList.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DatumSpecification rhs = (DatumSpecification)obj;
-
-
-     for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
-        if( ! ( fixedDatumIDList.get(idx).equals(rhs.fixedDatumIDList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumIDList.size(); idx++)
-        if( ! ( variableDatumIDList.get(idx).equals(rhs.variableDatumIDList.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fixedDatumIDList: ").append("\n");
-    fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumIDList: ").append("\n");
-    variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
deleted file mode 100644
index fb78036f0660cd5f4ed75edda2dd7abaf11693e8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Not specified in the standard. This is used by the ESPDU
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DeadReckoningParameters extends Object implements Serializable
-{
-   /** Algorithm to use in computing dead reckoning. See EBV doc. uid 44 */
-   protected DeadReckoningAlgorithm deadReckoningAlgorithm = DeadReckoningAlgorithm.values()[0];
-
-   /** Dead reckoning parameters. Contents depends on algorithm. */
-   protected byte[]  parameters = new byte[15]; 
-
-   /** Linear acceleration of the entity */
-   protected Vector3Float  entityLinearAcceleration = new Vector3Float(); 
-
-   /** Angular velocity of the entity */
-   protected Vector3Float  entityAngularVelocity = new Vector3Float(); 
-
-
-/** Constructor */
- public DeadReckoningParameters()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += deadReckoningAlgorithm.getMarshalledSize();
-   marshalSize += parameters.length * 1;
-   marshalSize += entityLinearAcceleration.getMarshalledSize();
-   marshalSize += entityAngularVelocity.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DeadReckoningParameters#deadReckoningAlgorithm}*/
-public DeadReckoningParameters setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
-{
-    deadReckoningAlgorithm = pDeadReckoningAlgorithm;
-    return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#deadReckoningAlgorithm}*/
-public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
-{
-    return deadReckoningAlgorithm; 
-}
-
-/** Setter for {@link DeadReckoningParameters#parameters}*/
-public DeadReckoningParameters setParameters(byte[] pParameters)
-{
-    parameters = Arrays.copyOf(pParameters, parameters.length);
-    return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#parameters}*/
-public byte[] getParameters()
-{
-    return parameters; 
-}
-
-/** Setter for {@link DeadReckoningParameters#entityLinearAcceleration}*/
-public DeadReckoningParameters setEntityLinearAcceleration(Vector3Float pEntityLinearAcceleration)
-{
-    entityLinearAcceleration = pEntityLinearAcceleration;
-    return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#entityLinearAcceleration}*/
-public Vector3Float getEntityLinearAcceleration()
-{
-    return entityLinearAcceleration; 
-}
-
-/** Setter for {@link DeadReckoningParameters#entityAngularVelocity}*/
-public DeadReckoningParameters setEntityAngularVelocity(Vector3Float pEntityAngularVelocity)
-{
-    entityAngularVelocity = pEntityAngularVelocity;
-    return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#entityAngularVelocity}*/
-public Vector3Float getEntityAngularVelocity()
-{
-    return entityAngularVelocity; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       deadReckoningAlgorithm.marshal(dos);
-
-       for(int idx = 0; idx < parameters.length; idx++)
-           dos.writeByte(parameters[idx]);
-
-       entityLinearAcceleration.marshal(dos);
-       entityAngularVelocity.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
-        uPosition += deadReckoningAlgorithm.getMarshalledSize();
-        for(int idx = 0; idx < parameters.length; idx++)
-            parameters[idx] = dis.readByte();
-        uPosition += (parameters.length * 1);
-        uPosition += entityLinearAcceleration.unmarshal(dis);
-        uPosition += entityAngularVelocity.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   deadReckoningAlgorithm.marshal(buff);
-
-   for(int idx = 0; idx < parameters.length; idx++)
-       buff.put((byte)parameters[idx]);
-
-   entityLinearAcceleration.marshal(buff);
-   entityAngularVelocity.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
-    for(int idx = 0; idx < parameters.length; idx++)
-        parameters[idx] = buff.get();
-    entityLinearAcceleration.unmarshal(buff);
-    entityAngularVelocity.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DeadReckoningParameters rhs = (DeadReckoningParameters)obj;
-
-     if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 15; idx++)
-     {
-          if(!(parameters[idx] == rhs.parameters[idx])) ivarsEqual = false;
-     }
-
-     if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
-     if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
-    sb.append(" parameters: ").append("\n");
-    sb.append(Arrays.toString(parameters)).append("\n");
-    sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
-    sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
deleted file mode 100644
index 4b891ee1210092e147ab877a73e31e621e23245a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.3 Handles designating operations. See 5.3.7.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DesignatorPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
-   /** ID of the entity designating */
-   protected EntityID  designatingEntityID = new EntityID(); 
-
-   /** This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system. uid 80 */
-   protected DesignatorSystemName codeName = DesignatorSystemName.values()[0];
-
-   /** ID of the entity being designated */
-   protected EntityID  designatedEntityID = new EntityID(); 
-
-   /** This field shall identify the designator code being used by the designating entity  uid 81 */
-   protected DesignatorDesignatorCode designatorCode = DesignatorDesignatorCode.values()[0];
-
-   /** This field shall identify the designator output power in watts */
-   protected float  designatorPower;
-
-   /** This field shall identify the designator wavelength in units of microns */
-   protected float  designatorWavelength;
-
-   /** designtor spot wrt the designated entity */
-   protected Vector3Float  designatorSpotWrtDesignated = new Vector3Float(); 
-
-   /** designtor spot wrt the designated entity */
-   protected Vector3Double  designatorSpotLocation = new Vector3Double(); 
-
-   /** Dead reckoning algorithm uid 44 */
-   protected DeadReckoningAlgorithm deadReckoningAlgorithm = DeadReckoningAlgorithm.values()[0];
-
-   /** padding */
-   protected byte  padding1;
-
-   /** padding */
-   protected short  padding2;
-
-   /** linear accelleration of entity */
-   protected Vector3Float  entityLinearAcceleration = new Vector3Float(); 
-
-
-/** Constructor */
- public DesignatorPdu()
- {
-    setPduType( DISPDUType.DESIGNATOR );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += designatingEntityID.getMarshalledSize();
-   marshalSize += codeName.getMarshalledSize();
-   marshalSize += designatedEntityID.getMarshalledSize();
-   marshalSize += designatorCode.getMarshalledSize();
-   marshalSize += 4;  // designatorPower
-   marshalSize += 4;  // designatorWavelength
-   marshalSize += designatorSpotWrtDesignated.getMarshalledSize();
-   marshalSize += designatorSpotLocation.getMarshalledSize();
-   marshalSize += deadReckoningAlgorithm.getMarshalledSize();
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-   marshalSize += entityLinearAcceleration.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DesignatorPdu#designatingEntityID}*/
-public DesignatorPdu setDesignatingEntityID(EntityID pDesignatingEntityID)
-{
-    designatingEntityID = pDesignatingEntityID;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatingEntityID}*/
-public EntityID getDesignatingEntityID()
-{
-    return designatingEntityID; 
-}
-
-/** Setter for {@link DesignatorPdu#codeName}*/
-public DesignatorPdu setCodeName(DesignatorSystemName pCodeName)
-{
-    codeName = pCodeName;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#codeName}*/
-public DesignatorSystemName getCodeName()
-{
-    return codeName; 
-}
-
-/** Setter for {@link DesignatorPdu#designatedEntityID}*/
-public DesignatorPdu setDesignatedEntityID(EntityID pDesignatedEntityID)
-{
-    designatedEntityID = pDesignatedEntityID;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatedEntityID}*/
-public EntityID getDesignatedEntityID()
-{
-    return designatedEntityID; 
-}
-
-/** Setter for {@link DesignatorPdu#designatorCode}*/
-public DesignatorPdu setDesignatorCode(DesignatorDesignatorCode pDesignatorCode)
-{
-    designatorCode = pDesignatorCode;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorCode}*/
-public DesignatorDesignatorCode getDesignatorCode()
-{
-    return designatorCode; 
-}
-
-/** Setter for {@link DesignatorPdu#designatorPower}*/
-public DesignatorPdu setDesignatorPower(float pDesignatorPower)
-{
-    designatorPower = pDesignatorPower;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorPower}*/
-public float getDesignatorPower()
-{
-    return designatorPower; 
-}
-
-/** Setter for {@link DesignatorPdu#designatorWavelength}*/
-public DesignatorPdu setDesignatorWavelength(float pDesignatorWavelength)
-{
-    designatorWavelength = pDesignatorWavelength;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorWavelength}*/
-public float getDesignatorWavelength()
-{
-    return designatorWavelength; 
-}
-
-/** Setter for {@link DesignatorPdu#designatorSpotWrtDesignated}*/
-public DesignatorPdu setDesignatorSpotWrtDesignated(Vector3Float pDesignatorSpotWrtDesignated)
-{
-    designatorSpotWrtDesignated = pDesignatorSpotWrtDesignated;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorSpotWrtDesignated}*/
-public Vector3Float getDesignatorSpotWrtDesignated()
-{
-    return designatorSpotWrtDesignated; 
-}
-
-/** Setter for {@link DesignatorPdu#designatorSpotLocation}*/
-public DesignatorPdu setDesignatorSpotLocation(Vector3Double pDesignatorSpotLocation)
-{
-    designatorSpotLocation = pDesignatorSpotLocation;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorSpotLocation}*/
-public Vector3Double getDesignatorSpotLocation()
-{
-    return designatorSpotLocation; 
-}
-
-/** Setter for {@link DesignatorPdu#deadReckoningAlgorithm}*/
-public DesignatorPdu setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
-{
-    deadReckoningAlgorithm = pDeadReckoningAlgorithm;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#deadReckoningAlgorithm}*/
-public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
-{
-    return deadReckoningAlgorithm; 
-}
-
-/** Setter for {@link DesignatorPdu#padding1}*/
-public DesignatorPdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link DesignatorPdu#padding2}*/
-public DesignatorPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link DesignatorPdu#entityLinearAcceleration}*/
-public DesignatorPdu setEntityLinearAcceleration(Vector3Float pEntityLinearAcceleration)
-{
-    entityLinearAcceleration = pEntityLinearAcceleration;
-    return this;
-}
-
-/** Getter for {@link DesignatorPdu#entityLinearAcceleration}*/
-public Vector3Float getEntityLinearAcceleration()
-{
-    return entityLinearAcceleration; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       designatingEntityID.marshal(dos);
-       codeName.marshal(dos);
-       designatedEntityID.marshal(dos);
-       designatorCode.marshal(dos);
-       dos.writeFloat(designatorPower);
-       dos.writeFloat(designatorWavelength);
-       designatorSpotWrtDesignated.marshal(dos);
-       designatorSpotLocation.marshal(dos);
-       deadReckoningAlgorithm.marshal(dos);
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-       entityLinearAcceleration.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += designatingEntityID.unmarshal(dis);
-        codeName = DesignatorSystemName.unmarshalEnum(dis);
-        uPosition += codeName.getMarshalledSize();
-        uPosition += designatedEntityID.unmarshal(dis);
-        designatorCode = DesignatorDesignatorCode.unmarshalEnum(dis);
-        uPosition += designatorCode.getMarshalledSize();
-        designatorPower = dis.readFloat();
-        uPosition += 4;
-        designatorWavelength = dis.readFloat();
-        uPosition += 4;
-        uPosition += designatorSpotWrtDesignated.unmarshal(dis);
-        uPosition += designatorSpotLocation.unmarshal(dis);
-        deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
-        uPosition += deadReckoningAlgorithm.getMarshalledSize();
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += entityLinearAcceleration.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   designatingEntityID.marshal(buff);
-   codeName.marshal(buff);
-   designatedEntityID.marshal(buff);
-   designatorCode.marshal(buff);
-   buff.putFloat( (float)designatorPower);
-   buff.putFloat( (float)designatorWavelength);
-   designatorSpotWrtDesignated.marshal(buff);
-   designatorSpotLocation.marshal(buff);
-   deadReckoningAlgorithm.marshal(buff);
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-   entityLinearAcceleration.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    designatingEntityID.unmarshal(buff);
-    codeName = DesignatorSystemName.unmarshalEnum(buff);
-    designatedEntityID.unmarshal(buff);
-    designatorCode = DesignatorDesignatorCode.unmarshalEnum(buff);
-    designatorPower = buff.getFloat();
-    designatorWavelength = buff.getFloat();
-    designatorSpotWrtDesignated.unmarshal(buff);
-    designatorSpotLocation.unmarshal(buff);
-    deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    entityLinearAcceleration.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DesignatorPdu rhs = (DesignatorPdu)obj;
-
-     if( ! (designatingEntityID.equals( rhs.designatingEntityID) )) ivarsEqual = false;
-     if( ! (codeName == rhs.codeName)) ivarsEqual = false;
-     if( ! (designatedEntityID.equals( rhs.designatedEntityID) )) ivarsEqual = false;
-     if( ! (designatorCode == rhs.designatorCode)) ivarsEqual = false;
-     if( ! (designatorPower == rhs.designatorPower)) ivarsEqual = false;
-     if( ! (designatorWavelength == rhs.designatorWavelength)) ivarsEqual = false;
-     if( ! (designatorSpotWrtDesignated.equals( rhs.designatorSpotWrtDesignated) )) ivarsEqual = false;
-     if( ! (designatorSpotLocation.equals( rhs.designatorSpotLocation) )) ivarsEqual = false;
-     if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" designatingEntityID: ").append(designatingEntityID).append("\n");
-    sb.append(" codeName: ").append(codeName).append("\n");
-    sb.append(" designatedEntityID: ").append(designatedEntityID).append("\n");
-    sb.append(" designatorCode: ").append(designatorCode).append("\n");
-    sb.append(" designatorPower: ").append(designatorPower).append("\n");
-    sb.append(" designatorWavelength: ").append(designatorWavelength).append("\n");
-    sb.append(" designatorSpotWrtDesignated: ").append(designatorSpotWrtDesignated).append("\n");
-    sb.append(" designatorSpotLocation: ").append(designatorSpotLocation).append("\n");
-    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DetonationPdu.java b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
deleted file mode 100644
index a228641c2be96533cb5cfb01a9d55567e143e3e3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DetonationPdu.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.3 Used to communicate the detonation or impact of munitions, as well as non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DetonationPdu extends WarfareFamilyPdu implements Serializable
-{
-   /** ID of the entity that shot */
-   protected EntityID  sourceEntityID = new EntityID(); 
-
-   /** ID of the entity that is being shot at */
-   protected EntityID  targetEntityID = new EntityID(); 
-
-   /** ID of the expendable entity, Section 7.3.3  */
-   protected EntityID  explodingEntityID = new EntityID(); 
-
-   /** ID of event, Section 7.3.3 */
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** velocity of the munition immediately before detonation/impact, Section 7.3.3  */
-   protected Vector3Float  velocity = new Vector3Float(); 
-
-   /** location of the munition detonation, the expendable detonation, Section 7.3.3  */
-   protected Vector3Double  locationInWorldCoordinates = new Vector3Double(); 
-
-   /** Describes the detonation represented, Section 7.3.3  */
-   protected MunitionDescriptor  descriptor = new MunitionDescriptor(); 
-
-   /** Velocity of the ammunition, Section 7.3.3  */
-   protected Vector3Float  locationOfEntityCoordinates = new Vector3Float(); 
-
-   /** result of the detonation, Section 7.3.3  uid 62 */
-   protected DetonationResult detonationResult = DetonationResult.values()[0];
-
-   /** How many articulation parameters we have, Section 7.3.3  */
-   protected byte  numberOfVariableParameters;
-
-   /** padding */
-   protected short  pad;
-
-   /** specify the parameter values for each Variable Parameter record, Section 7.3.3  */
-   protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
- 
-
-/** Constructor */
- public DetonationPdu()
- {
-    setPduType( DISPDUType.DETONATION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += sourceEntityID.getMarshalledSize();
-   marshalSize += targetEntityID.getMarshalledSize();
-   marshalSize += explodingEntityID.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += velocity.getMarshalledSize();
-   marshalSize += locationInWorldCoordinates.getMarshalledSize();
-   marshalSize += descriptor.getMarshalledSize();
-   marshalSize += locationOfEntityCoordinates.getMarshalledSize();
-   marshalSize += detonationResult.getMarshalledSize();
-   marshalSize += 1;  // numberOfVariableParameters
-   marshalSize += 2;  // pad
-   for(int idx=0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter listElement = variableParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DetonationPdu#sourceEntityID}*/
-public DetonationPdu setSourceEntityID(EntityID pSourceEntityID)
-{
-    sourceEntityID = pSourceEntityID;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#sourceEntityID}*/
-public EntityID getSourceEntityID()
-{
-    return sourceEntityID; 
-}
-
-/** Setter for {@link DetonationPdu#targetEntityID}*/
-public DetonationPdu setTargetEntityID(EntityID pTargetEntityID)
-{
-    targetEntityID = pTargetEntityID;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#targetEntityID}*/
-public EntityID getTargetEntityID()
-{
-    return targetEntityID; 
-}
-
-/** Setter for {@link DetonationPdu#explodingEntityID}*/
-public DetonationPdu setExplodingEntityID(EntityID pExplodingEntityID)
-{
-    explodingEntityID = pExplodingEntityID;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#explodingEntityID}*/
-public EntityID getExplodingEntityID()
-{
-    return explodingEntityID; 
-}
-
-/** Setter for {@link DetonationPdu#eventID}*/
-public DetonationPdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link DetonationPdu#velocity}*/
-public DetonationPdu setVelocity(Vector3Float pVelocity)
-{
-    velocity = pVelocity;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#velocity}*/
-public Vector3Float getVelocity()
-{
-    return velocity; 
-}
-
-/** Setter for {@link DetonationPdu#locationInWorldCoordinates}*/
-public DetonationPdu setLocationInWorldCoordinates(Vector3Double pLocationInWorldCoordinates)
-{
-    locationInWorldCoordinates = pLocationInWorldCoordinates;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#locationInWorldCoordinates}*/
-public Vector3Double getLocationInWorldCoordinates()
-{
-    return locationInWorldCoordinates; 
-}
-
-/** Setter for {@link DetonationPdu#descriptor}*/
-public DetonationPdu setDescriptor(MunitionDescriptor pDescriptor)
-{
-    descriptor = pDescriptor;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#descriptor}*/
-public MunitionDescriptor getDescriptor()
-{
-    return descriptor; 
-}
-
-/** Setter for {@link DetonationPdu#locationOfEntityCoordinates}*/
-public DetonationPdu setLocationOfEntityCoordinates(Vector3Float pLocationOfEntityCoordinates)
-{
-    locationOfEntityCoordinates = pLocationOfEntityCoordinates;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#locationOfEntityCoordinates}*/
-public Vector3Float getLocationOfEntityCoordinates()
-{
-    return locationOfEntityCoordinates; 
-}
-
-/** Setter for {@link DetonationPdu#detonationResult}*/
-public DetonationPdu setDetonationResult(DetonationResult pDetonationResult)
-{
-    detonationResult = pDetonationResult;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#detonationResult}*/
-public DetonationResult getDetonationResult()
-{
-    return detonationResult; 
-}
-
-/** Setter for {@link DetonationPdu#pad}*/
-public DetonationPdu setPad(short pPad)
-{
-    pad = pPad;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#pad}*/
-public short getPad()
-{
-    return pad; 
-}
-
-/** Setter for {@link DetonationPdu#variableParameters}*/
-public DetonationPdu setVariableParameters(List<VariableParameter> pVariableParameters)
-{
-    variableParameters = pVariableParameters;
-    return this;
-}
-
-/** Getter for {@link DetonationPdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
-{
-    return variableParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       sourceEntityID.marshal(dos);
-       targetEntityID.marshal(dos);
-       explodingEntityID.marshal(dos);
-       eventID.marshal(dos);
-       velocity.marshal(dos);
-       locationInWorldCoordinates.marshal(dos);
-       descriptor.marshal(dos);
-       locationOfEntityCoordinates.marshal(dos);
-       detonationResult.marshal(dos);
-       dos.writeByte(variableParameters.size());
-       dos.writeShort(pad);
-
-       for(int idx = 0; idx < variableParameters.size(); idx++)
-       {
-            VariableParameter aVariableParameter = variableParameters.get(idx);
-            aVariableParameter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += sourceEntityID.unmarshal(dis);
-        uPosition += targetEntityID.unmarshal(dis);
-        uPosition += explodingEntityID.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        uPosition += velocity.unmarshal(dis);
-        uPosition += locationInWorldCoordinates.unmarshal(dis);
-        uPosition += descriptor.unmarshal(dis);
-        uPosition += locationOfEntityCoordinates.unmarshal(dis);
-        detonationResult = DetonationResult.unmarshalEnum(dis);
-        uPosition += detonationResult.getMarshalledSize();
-        numberOfVariableParameters = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfVariableParameters; idx++)
-        {
-            VariableParameter anX = new VariableParameter();
-            uPosition += anX.unmarshal(dis);
-            variableParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   sourceEntityID.marshal(buff);
-   targetEntityID.marshal(buff);
-   explodingEntityID.marshal(buff);
-   eventID.marshal(buff);
-   velocity.marshal(buff);
-   locationInWorldCoordinates.marshal(buff);
-   descriptor.marshal(buff);
-   locationOfEntityCoordinates.marshal(buff);
-   detonationResult.marshal(buff);
-   buff.put( (byte)variableParameters.size());
-   buff.putShort( (short)pad);
-
-   for(int idx = 0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter aVariableParameter = variableParameters.get(idx);
-        aVariableParameter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    sourceEntityID.unmarshal(buff);
-    targetEntityID.unmarshal(buff);
-    explodingEntityID.unmarshal(buff);
-    eventID.unmarshal(buff);
-    velocity.unmarshal(buff);
-    locationInWorldCoordinates.unmarshal(buff);
-    descriptor.unmarshal(buff);
-    locationOfEntityCoordinates.unmarshal(buff);
-    detonationResult = DetonationResult.unmarshalEnum(buff);
-    numberOfVariableParameters = (byte)(buff.get() & 0xFF);
-    pad = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfVariableParameters; idx++)
-    {
-    VariableParameter anX = new VariableParameter();
-    anX.unmarshal(buff);
-    variableParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DetonationPdu rhs = (DetonationPdu)obj;
-
-     if( ! (sourceEntityID.equals( rhs.sourceEntityID) )) ivarsEqual = false;
-     if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
-     if( ! (explodingEntityID.equals( rhs.explodingEntityID) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-     if( ! (locationInWorldCoordinates.equals( rhs.locationInWorldCoordinates) )) ivarsEqual = false;
-     if( ! (descriptor.equals( rhs.descriptor) )) ivarsEqual = false;
-     if( ! (locationOfEntityCoordinates.equals( rhs.locationOfEntityCoordinates) )) ivarsEqual = false;
-     if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
-     if( ! (pad == rhs.pad)) ivarsEqual = false;
-
-     for(int idx = 0; idx < variableParameters.size(); idx++)
-        if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
-    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
-    sb.append(" explodingEntityID: ").append(explodingEntityID).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" velocity: ").append(velocity).append("\n");
-    sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
-    sb.append(" descriptor: ").append(descriptor).append("\n");
-    sb.append(" locationOfEntityCoordinates: ").append(locationOfEntityCoordinates).append("\n");
-    sb.append(" detonationResult: ").append(detonationResult).append("\n");
-    sb.append(" pad: ").append(pad).append("\n");
-    sb.append(" variableParameters: ").append("\n");
-    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
deleted file mode 100644
index ff192054b682f4da88649ccbaac919790c737eda..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * DE Precision Aimpoint Record. Section 6.2.20.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DirectedEnergyAreaAimpoint extends Object implements Serializable
-{
-   /** Type of Record enumeration */
-   protected int  recordType = (int)4001;
-
-   /** Length of Record */
-   protected short  recordLength;
-
-   /** Padding */
-   protected short  padding = (short)0;
-
-   /** Number of beam antenna pattern records */
-   protected short  beamAntennaPatternRecordCount = (short)0;
-
-   /** Number of DE target energy depositon records */
-   protected short  directedEnergyTargetEnergyDepositionRecordCount = (short)0;
-
-   /** list of beam antenna records. See 6.2.9.2 */
-   protected List< BeamAntennaPattern > beamAntennaParameterList = new ArrayList< BeamAntennaPattern >();
- 
-   /** list of DE target deposition records. See 6.2.21.4 */
-   protected List< DirectedEnergyTargetEnergyDeposition > directedEnergyTargetEnergyDepositionRecordList = new ArrayList< DirectedEnergyTargetEnergyDeposition >();
- 
-   private byte[] padding2 = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public DirectedEnergyAreaAimpoint()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // padding
-   marshalSize += 2;  // beamAntennaPatternRecordCount
-   marshalSize += 2;  // directedEnergyTargetEnergyDepositionRecordCount
-   for(int idx=0; idx < beamAntennaParameterList.size(); idx++)
-   {
-        BeamAntennaPattern listElement = beamAntennaParameterList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
-   {
-        DirectedEnergyTargetEnergyDeposition listElement = directedEnergyTargetEnergyDepositionRecordList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += padding2.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#recordType}*/
-public DirectedEnergyAreaAimpoint setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#recordLength}*/
-public DirectedEnergyAreaAimpoint setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#padding}*/
-public DirectedEnergyAreaAimpoint setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#beamAntennaParameterList}*/
-public DirectedEnergyAreaAimpoint setBeamAntennaParameterList(List<BeamAntennaPattern> pBeamAntennaParameterList)
-{
-    beamAntennaParameterList = pBeamAntennaParameterList;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#beamAntennaParameterList}*/
-public List<BeamAntennaPattern> getBeamAntennaParameterList()
-{
-    return beamAntennaParameterList; 
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#directedEnergyTargetEnergyDepositionRecordList}*/
-public DirectedEnergyAreaAimpoint setDirectedEnergyTargetEnergyDepositionRecordList(List<DirectedEnergyTargetEnergyDeposition> pDirectedEnergyTargetEnergyDepositionRecordList)
-{
-    directedEnergyTargetEnergyDepositionRecordList = pDirectedEnergyTargetEnergyDepositionRecordList;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#directedEnergyTargetEnergyDepositionRecordList}*/
-public List<DirectedEnergyTargetEnergyDeposition> getDirectedEnergyTargetEnergyDepositionRecordList()
-{
-    return directedEnergyTargetEnergyDepositionRecordList; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordLength);
-       dos.writeShort(padding);
-       dos.writeShort(beamAntennaParameterList.size());
-       dos.writeShort(directedEnergyTargetEnergyDepositionRecordList.size());
-
-       for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
-       {
-            BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
-            aBeamAntennaPattern.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
-       {
-            DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
-            aDirectedEnergyTargetEnergyDeposition.marshal(dos);
-       }
-
-       padding2 = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        beamAntennaPatternRecordCount = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        directedEnergyTargetEnergyDepositionRecordCount = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < beamAntennaPatternRecordCount; idx++)
-        {
-            BeamAntennaPattern anX = new BeamAntennaPattern();
-            uPosition += anX.unmarshal(dis);
-            beamAntennaParameterList.add(anX);
-        }
-
-        for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordCount; idx++)
-        {
-            DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
-            uPosition += anX.unmarshal(dis);
-            directedEnergyTargetEnergyDepositionRecordList.add(anX);
-        }
-
-        padding2 = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding2.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)padding);
-   buff.putShort( (short)beamAntennaParameterList.size());
-   buff.putShort( (short)directedEnergyTargetEnergyDepositionRecordList.size());
-
-   for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
-   {
-        BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
-        aBeamAntennaPattern.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
-   {
-        DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
-        aDirectedEnergyTargetEnergyDeposition.marshal(buff);
-   }
-
-   padding2 = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    beamAntennaPatternRecordCount = (short)(buff.getShort() & 0xFFFF);
-    directedEnergyTargetEnergyDepositionRecordCount = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < beamAntennaPatternRecordCount; idx++)
-    {
-    BeamAntennaPattern anX = new BeamAntennaPattern();
-    anX.unmarshal(buff);
-    beamAntennaParameterList.add(anX);
-    }
-
-    for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordCount; idx++)
-    {
-    DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
-    anX.unmarshal(buff);
-    directedEnergyTargetEnergyDepositionRecordList.add(anX);
-    }
-
-    padding2 = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DirectedEnergyAreaAimpoint rhs = (DirectedEnergyAreaAimpoint)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-
-     for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
-        if( ! ( beamAntennaParameterList.get(idx).equals(rhs.beamAntennaParameterList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
-        if( ! ( directedEnergyTargetEnergyDepositionRecordList.get(idx).equals(rhs.directedEnergyTargetEnergyDepositionRecordList.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" beamAntennaParameterList: ").append("\n");
-    beamAntennaParameterList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" directedEnergyTargetEnergyDepositionRecordList: ").append("\n");
-    directedEnergyTargetEnergyDepositionRecordList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
deleted file mode 100644
index 6dc52dfe9da5d088e6053e1b26cb81331e5749f8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.15.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DirectedEnergyDamage extends Object implements Serializable
-{
-   /** DE Record Type. */
-   protected int  recordType = (int)4500;
-
-   /** DE Record Length (bytes) */
-   protected short  recordLength = (short)40;
-
-   /** padding */
-   protected short  padding = (short)0;
-
-   /** location of damage, relative to center of entity */
-   protected Vector3Float  damageLocation = new Vector3Float(); 
-
-   /** Size of damaged area, in meters */
-   protected float  damageDiameter;
-
-   /** average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15 */
-   protected float  temperature = (float)-273.15;
-
-   /** enumeration uid 314 */
-   protected EntityDamageStatusComponentIdentification componentIdentification = EntityDamageStatusComponentIdentification.values()[0];
-
-   /** enumeration uid 315 */
-   protected DEDamageDescriptionComponentDamageStatus componentDamageStatus = DEDamageDescriptionComponentDamageStatus.values()[0];
-
-   /** enumeration uid 317 */
-   protected DEDamageDescriptionComponentVisualDamageStatus componentVisualDamageStatus = new DEDamageDescriptionComponentVisualDamageStatus();
-
-   /** enumeration uid 316 */
-   protected DEDamageDescriptionComponentVisualSmokeColor componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.values()[0];
-
-   /** For any component damage resulting this field shall be set to the fire event ID from that PDU. */
-   protected EventIdentifier  fireEventID = new EventIdentifier(); 
-
-   /** padding */
-   protected short  padding2 = (short)0;
-
-
-/** Constructor */
- public DirectedEnergyDamage()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // padding
-   marshalSize += damageLocation.getMarshalledSize();
-   marshalSize += 4;  // damageDiameter
-   marshalSize += 4;  // temperature
-   marshalSize += componentIdentification.getMarshalledSize();
-   marshalSize += componentDamageStatus.getMarshalledSize();
-   marshalSize += componentVisualDamageStatus.getMarshalledSize();
-   marshalSize += componentVisualSmokeColor.getMarshalledSize();
-   marshalSize += fireEventID.getMarshalledSize();
-   marshalSize += 2;  // padding2
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyDamage#recordType}*/
-public DirectedEnergyDamage setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#recordLength}*/
-public DirectedEnergyDamage setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#padding}*/
-public DirectedEnergyDamage setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#damageLocation}*/
-public DirectedEnergyDamage setDamageLocation(Vector3Float pDamageLocation)
-{
-    damageLocation = pDamageLocation;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#damageLocation}*/
-public Vector3Float getDamageLocation()
-{
-    return damageLocation; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#damageDiameter}*/
-public DirectedEnergyDamage setDamageDiameter(float pDamageDiameter)
-{
-    damageDiameter = pDamageDiameter;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#damageDiameter}*/
-public float getDamageDiameter()
-{
-    return damageDiameter; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#temperature}*/
-public DirectedEnergyDamage setTemperature(float pTemperature)
-{
-    temperature = pTemperature;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#temperature}*/
-public float getTemperature()
-{
-    return temperature; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentIdentification}*/
-public DirectedEnergyDamage setComponentIdentification(EntityDamageStatusComponentIdentification pComponentIdentification)
-{
-    componentIdentification = pComponentIdentification;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#componentIdentification}*/
-public EntityDamageStatusComponentIdentification getComponentIdentification()
-{
-    return componentIdentification; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentDamageStatus}*/
-public DirectedEnergyDamage setComponentDamageStatus(DEDamageDescriptionComponentDamageStatus pComponentDamageStatus)
-{
-    componentDamageStatus = pComponentDamageStatus;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#componentDamageStatus}*/
-public DEDamageDescriptionComponentDamageStatus getComponentDamageStatus()
-{
-    return componentDamageStatus; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentVisualDamageStatus}*/
-public DirectedEnergyDamage setComponentVisualDamageStatus(DEDamageDescriptionComponentVisualDamageStatus pComponentVisualDamageStatus)
-{
-    componentVisualDamageStatus = pComponentVisualDamageStatus;
-    return this;
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentVisualDamageStatus}*/
-public DEDamageDescriptionComponentVisualDamageStatus getComponentVisualDamageStatus()
-{
-    return componentVisualDamageStatus; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentVisualSmokeColor}*/
-public DirectedEnergyDamage setComponentVisualSmokeColor(DEDamageDescriptionComponentVisualSmokeColor pComponentVisualSmokeColor)
-{
-    componentVisualSmokeColor = pComponentVisualSmokeColor;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#componentVisualSmokeColor}*/
-public DEDamageDescriptionComponentVisualSmokeColor getComponentVisualSmokeColor()
-{
-    return componentVisualSmokeColor; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#fireEventID}*/
-public DirectedEnergyDamage setFireEventID(EventIdentifier pFireEventID)
-{
-    fireEventID = pFireEventID;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#fireEventID}*/
-public EventIdentifier getFireEventID()
-{
-    return fireEventID; 
-}
-
-/** Setter for {@link DirectedEnergyDamage#padding2}*/
-public DirectedEnergyDamage setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordLength);
-       dos.writeShort(padding);
-       damageLocation.marshal(dos);
-       dos.writeFloat(damageDiameter);
-       dos.writeFloat(temperature);
-       componentIdentification.marshal(dos);
-       componentDamageStatus.marshal(dos);
-       componentVisualDamageStatus.marshal(dos);
-       componentVisualSmokeColor.marshal(dos);
-       fireEventID.marshal(dos);
-       dos.writeShort(padding2);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += damageLocation.unmarshal(dis);
-        damageDiameter = dis.readFloat();
-        uPosition += 4;
-        temperature = dis.readFloat();
-        uPosition += 4;
-        componentIdentification = EntityDamageStatusComponentIdentification.unmarshalEnum(dis);
-        uPosition += componentIdentification.getMarshalledSize();
-        componentDamageStatus = DEDamageDescriptionComponentDamageStatus.unmarshalEnum(dis);
-        uPosition += componentDamageStatus.getMarshalledSize();
-        uPosition += componentVisualDamageStatus.unmarshal(dis);
-        componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.unmarshalEnum(dis);
-        uPosition += componentVisualSmokeColor.getMarshalledSize();
-        uPosition += fireEventID.unmarshal(dis);
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)padding);
-   damageLocation.marshal(buff);
-   buff.putFloat( (float)damageDiameter);
-   buff.putFloat( (float)temperature);
-   componentIdentification.marshal(buff);
-   componentDamageStatus.marshal(buff);
-   componentVisualDamageStatus.marshal(buff);
-   componentVisualSmokeColor.marshal(buff);
-   fireEventID.marshal(buff);
-   buff.putShort( (short)padding2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    damageLocation.unmarshal(buff);
-    damageDiameter = buff.getFloat();
-    temperature = buff.getFloat();
-    componentIdentification = EntityDamageStatusComponentIdentification.unmarshalEnum(buff);
-    componentDamageStatus = DEDamageDescriptionComponentDamageStatus.unmarshalEnum(buff);
-    componentVisualDamageStatus.unmarshal(buff);
-    componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.unmarshalEnum(buff);
-    fireEventID.unmarshal(buff);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DirectedEnergyDamage rhs = (DirectedEnergyDamage)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (damageLocation.equals( rhs.damageLocation) )) ivarsEqual = false;
-     if( ! (damageDiameter == rhs.damageDiameter)) ivarsEqual = false;
-     if( ! (temperature == rhs.temperature)) ivarsEqual = false;
-     if( ! (componentIdentification == rhs.componentIdentification)) ivarsEqual = false;
-     if( ! (componentDamageStatus == rhs.componentDamageStatus)) ivarsEqual = false;
-     if( ! (componentVisualDamageStatus.equals( rhs.componentVisualDamageStatus) )) ivarsEqual = false;
-     if( ! (componentVisualSmokeColor == rhs.componentVisualSmokeColor)) ivarsEqual = false;
-     if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" damageLocation: ").append(damageLocation).append("\n");
-    sb.append(" damageDiameter: ").append(damageDiameter).append("\n");
-    sb.append(" temperature: ").append(temperature).append("\n");
-    sb.append(" componentIdentification: ").append(componentIdentification).append("\n");
-    sb.append(" componentDamageStatus: ").append(componentDamageStatus).append("\n");
-    sb.append(" componentVisualDamageStatus: ").append(componentVisualDamageStatus).append("\n");
-    sb.append(" componentVisualSmokeColor: ").append(componentVisualSmokeColor).append("\n");
-    sb.append(" fireEventID: ").append(fireEventID).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
deleted file mode 100644
index f552eaceb7b07d8d53cb77255cef124b3e95e1d1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.4 Used to communicate the firing of a directed energy weapon.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DirectedEnergyFirePdu extends WarfareFamilyPdu implements Serializable
-{
-   /** ID of the entity that shot */
-   protected EntityID  firingEntityID = new EntityID(); 
-
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4  */
-   protected EntityType  munitionType = new EntityType(); 
-
-   /** Field shall indicate the simulation time at start of the shot, Section 7.3.4  */
-   protected ClockTime  shotStartTime = new ClockTime(); 
-
-   /** Field shall indicate the current cumulative duration of the shot, Section 7.3.4  */
-   protected float  commulativeShotTime;
-
-   /** Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4  */
-   protected Vector3Float  apertureEmitterLocation = new Vector3Float(); 
-
-   /** Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4  */
-   protected float  apertureDiameter;
-
-   /** Field shall identify the emissions wavelength in units of meters, Section 7.3.4  */
-   protected float  wavelength;
-
-   protected int  pad1;
-
-   protected float  pulseRepititionFrequency;
-
-   /** field shall identify the pulse width emissions in units of seconds, Section 7.3.4 */
-   protected float  pulseWidth;
-
-   /** 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4  uid 313 */
-   protected DEFireFlags flags = new DEFireFlags();
-
-   /** Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4  uid 312 */
-   protected DEFirePulseShape pulseShape = DEFirePulseShape.values()[0];
-
-   protected byte  pad2;
-
-   protected int  pad3;
-
-   protected short  pad4;
-
-   /** Field shall specify the number of DE records, Section 7.3.4  */
-   protected short  numberOfDERecords;
-
-   /** Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4 */
-   protected List< StandardVariableSpecification > dERecords = new ArrayList< StandardVariableSpecification >();
- 
-
-/** Constructor */
- public DirectedEnergyFirePdu()
- {
-    setPduType( DISPDUType.DIRECTED_ENERGY_FIRE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += firingEntityID.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += munitionType.getMarshalledSize();
-   marshalSize += shotStartTime.getMarshalledSize();
-   marshalSize += 4;  // commulativeShotTime
-   marshalSize += apertureEmitterLocation.getMarshalledSize();
-   marshalSize += 4;  // apertureDiameter
-   marshalSize += 4;  // wavelength
-   marshalSize += 4;  // pad1
-   marshalSize += 4;  // pulseRepititionFrequency
-   marshalSize += 4;  // pulseWidth
-   marshalSize += flags.getMarshalledSize();
-   marshalSize += pulseShape.getMarshalledSize();
-   marshalSize += 1;  // pad2
-   marshalSize += 4;  // pad3
-   marshalSize += 2;  // pad4
-   marshalSize += 2;  // numberOfDERecords
-   for(int idx=0; idx < dERecords.size(); idx++)
-   {
-        StandardVariableSpecification listElement = dERecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyFirePdu#firingEntityID}*/
-public DirectedEnergyFirePdu setFiringEntityID(EntityID pFiringEntityID)
-{
-    firingEntityID = pFiringEntityID;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#firingEntityID}*/
-public EntityID getFiringEntityID()
-{
-    return firingEntityID; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#eventID}*/
-public DirectedEnergyFirePdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#munitionType}*/
-public DirectedEnergyFirePdu setMunitionType(EntityType pMunitionType)
-{
-    munitionType = pMunitionType;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#munitionType}*/
-public EntityType getMunitionType()
-{
-    return munitionType; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#shotStartTime}*/
-public DirectedEnergyFirePdu setShotStartTime(ClockTime pShotStartTime)
-{
-    shotStartTime = pShotStartTime;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#shotStartTime}*/
-public ClockTime getShotStartTime()
-{
-    return shotStartTime; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#commulativeShotTime}*/
-public DirectedEnergyFirePdu setCommulativeShotTime(float pCommulativeShotTime)
-{
-    commulativeShotTime = pCommulativeShotTime;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#commulativeShotTime}*/
-public float getCommulativeShotTime()
-{
-    return commulativeShotTime; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#apertureEmitterLocation}*/
-public DirectedEnergyFirePdu setApertureEmitterLocation(Vector3Float pApertureEmitterLocation)
-{
-    apertureEmitterLocation = pApertureEmitterLocation;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#apertureEmitterLocation}*/
-public Vector3Float getApertureEmitterLocation()
-{
-    return apertureEmitterLocation; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#apertureDiameter}*/
-public DirectedEnergyFirePdu setApertureDiameter(float pApertureDiameter)
-{
-    apertureDiameter = pApertureDiameter;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#apertureDiameter}*/
-public float getApertureDiameter()
-{
-    return apertureDiameter; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#wavelength}*/
-public DirectedEnergyFirePdu setWavelength(float pWavelength)
-{
-    wavelength = pWavelength;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#wavelength}*/
-public float getWavelength()
-{
-    return wavelength; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad1}*/
-public DirectedEnergyFirePdu setPad1(int pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad1}*/
-public int getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pulseRepititionFrequency}*/
-public DirectedEnergyFirePdu setPulseRepititionFrequency(float pPulseRepititionFrequency)
-{
-    pulseRepititionFrequency = pPulseRepititionFrequency;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pulseRepititionFrequency}*/
-public float getPulseRepititionFrequency()
-{
-    return pulseRepititionFrequency; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pulseWidth}*/
-public DirectedEnergyFirePdu setPulseWidth(float pPulseWidth)
-{
-    pulseWidth = pPulseWidth;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pulseWidth}*/
-public float getPulseWidth()
-{
-    return pulseWidth; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#flags}*/
-public DirectedEnergyFirePdu setFlags(DEFireFlags pFlags)
-{
-    flags = pFlags;
-    return this;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#flags}*/
-public DEFireFlags getFlags()
-{
-    return flags; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pulseShape}*/
-public DirectedEnergyFirePdu setPulseShape(DEFirePulseShape pPulseShape)
-{
-    pulseShape = pPulseShape;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pulseShape}*/
-public DEFirePulseShape getPulseShape()
-{
-    return pulseShape; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad2}*/
-public DirectedEnergyFirePdu setPad2(byte pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad2}*/
-public byte getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad3}*/
-public DirectedEnergyFirePdu setPad3(int pPad3)
-{
-    pad3 = pPad3;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad3}*/
-public int getPad3()
-{
-    return pad3; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad4}*/
-public DirectedEnergyFirePdu setPad4(short pPad4)
-{
-    pad4 = pPad4;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad4}*/
-public short getPad4()
-{
-    return pad4; 
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#dERecords}*/
-public DirectedEnergyFirePdu setDERecords(List<StandardVariableSpecification> pDERecords)
-{
-    dERecords = pDERecords;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#dERecords}*/
-public List<StandardVariableSpecification> getDERecords()
-{
-    return dERecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       firingEntityID.marshal(dos);
-       eventID.marshal(dos);
-       munitionType.marshal(dos);
-       shotStartTime.marshal(dos);
-       dos.writeFloat(commulativeShotTime);
-       apertureEmitterLocation.marshal(dos);
-       dos.writeFloat(apertureDiameter);
-       dos.writeFloat(wavelength);
-       dos.writeInt(pad1);
-       dos.writeFloat(pulseRepititionFrequency);
-       dos.writeFloat(pulseWidth);
-       flags.marshal(dos);
-       pulseShape.marshal(dos);
-       dos.writeByte(pad2);
-       dos.writeInt(pad3);
-       dos.writeShort(pad4);
-       dos.writeShort(dERecords.size());
-
-       for(int idx = 0; idx < dERecords.size(); idx++)
-       {
-            StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
-            aStandardVariableSpecification.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += firingEntityID.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        uPosition += munitionType.unmarshal(dis);
-        uPosition += shotStartTime.unmarshal(dis);
-        commulativeShotTime = dis.readFloat();
-        uPosition += 4;
-        uPosition += apertureEmitterLocation.unmarshal(dis);
-        apertureDiameter = dis.readFloat();
-        uPosition += 4;
-        wavelength = dis.readFloat();
-        uPosition += 4;
-        pad1 = dis.readInt();
-        uPosition += 4;
-        pulseRepititionFrequency = dis.readFloat();
-        uPosition += 4;
-        pulseWidth = dis.readFloat();
-        uPosition += 4;
-        uPosition += flags.unmarshal(dis);
-        pulseShape = DEFirePulseShape.unmarshalEnum(dis);
-        uPosition += pulseShape.getMarshalledSize();
-        pad2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad3 = dis.readInt();
-        uPosition += 4;
-        pad4 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfDERecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfDERecords; idx++)
-        {
-            StandardVariableSpecification anX = new StandardVariableSpecification();
-            uPosition += anX.unmarshal(dis);
-            dERecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   firingEntityID.marshal(buff);
-   eventID.marshal(buff);
-   munitionType.marshal(buff);
-   shotStartTime.marshal(buff);
-   buff.putFloat( (float)commulativeShotTime);
-   apertureEmitterLocation.marshal(buff);
-   buff.putFloat( (float)apertureDiameter);
-   buff.putFloat( (float)wavelength);
-   buff.putInt( (int)pad1);
-   buff.putFloat( (float)pulseRepititionFrequency);
-   buff.putFloat( (float)pulseWidth);
-   flags.marshal(buff);
-   pulseShape.marshal(buff);
-   buff.put( (byte)pad2);
-   buff.putInt( (int)pad3);
-   buff.putShort( (short)pad4);
-   buff.putShort( (short)dERecords.size());
-
-   for(int idx = 0; idx < dERecords.size(); idx++)
-   {
-        StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
-        aStandardVariableSpecification.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    firingEntityID.unmarshal(buff);
-    eventID.unmarshal(buff);
-    munitionType.unmarshal(buff);
-    shotStartTime.unmarshal(buff);
-    commulativeShotTime = buff.getFloat();
-    apertureEmitterLocation.unmarshal(buff);
-    apertureDiameter = buff.getFloat();
-    wavelength = buff.getFloat();
-    pad1 = buff.getInt();
-    pulseRepititionFrequency = buff.getFloat();
-    pulseWidth = buff.getFloat();
-    flags.unmarshal(buff);
-    pulseShape = DEFirePulseShape.unmarshalEnum(buff);
-    pad2 = (byte)(buff.get() & 0xFF);
-    pad3 = buff.getInt();
-    pad4 = (short)(buff.getShort() & 0xFFFF);
-    numberOfDERecords = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfDERecords; idx++)
-    {
-    StandardVariableSpecification anX = new StandardVariableSpecification();
-    anX.unmarshal(buff);
-    dERecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DirectedEnergyFirePdu rhs = (DirectedEnergyFirePdu)obj;
-
-     if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
-     if( ! (shotStartTime.equals( rhs.shotStartTime) )) ivarsEqual = false;
-     if( ! (commulativeShotTime == rhs.commulativeShotTime)) ivarsEqual = false;
-     if( ! (apertureEmitterLocation.equals( rhs.apertureEmitterLocation) )) ivarsEqual = false;
-     if( ! (apertureDiameter == rhs.apertureDiameter)) ivarsEqual = false;
-     if( ! (wavelength == rhs.wavelength)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pulseRepititionFrequency == rhs.pulseRepititionFrequency)) ivarsEqual = false;
-     if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
-     if( ! (flags.equals( rhs.flags) )) ivarsEqual = false;
-     if( ! (pulseShape == rhs.pulseShape)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
-     if( ! (pad4 == rhs.pad4)) ivarsEqual = false;
-
-     for(int idx = 0; idx < dERecords.size(); idx++)
-        if( ! ( dERecords.get(idx).equals(rhs.dERecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" munitionType: ").append(munitionType).append("\n");
-    sb.append(" shotStartTime: ").append(shotStartTime).append("\n");
-    sb.append(" commulativeShotTime: ").append(commulativeShotTime).append("\n");
-    sb.append(" apertureEmitterLocation: ").append(apertureEmitterLocation).append("\n");
-    sb.append(" apertureDiameter: ").append(apertureDiameter).append("\n");
-    sb.append(" wavelength: ").append(wavelength).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pulseRepititionFrequency: ").append(pulseRepititionFrequency).append("\n");
-    sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
-    sb.append(" flags: ").append(flags).append("\n");
-    sb.append(" pulseShape: ").append(pulseShape).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" pad3: ").append(pad3).append("\n");
-    sb.append(" pad4: ").append(pad4).append("\n");
-    sb.append(" dERecords: ").append("\n");
-    dERecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
deleted file mode 100644
index da05138341880026e5ceb78488a54286142bfce3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * DE Precision Aimpoint Record. Section 6.2.20.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DirectedEnergyPrecisionAimpoint extends Object implements Serializable
-{
-   /** Type of Record */
-   protected int  recordType = (int)4000;
-
-   /** Length of Record */
-   protected short  recordLength = (short)88;
-
-   /** Padding */
-   protected short  padding = (short)0;
-
-   /** Position of Target Spot in World Coordinates. */
-   protected Vector3Double  targetSpotLocation = new Vector3Double(); 
-
-   /** Position (meters) of Target Spot relative to Entity Position. */
-   protected Vector3Float  targetSpotEntityLocation = new Vector3Float(); 
-
-   /** Velocity (meters/sec) of Target Spot. */
-   protected Vector3Float  targetSpotVelocity = new Vector3Float(); 
-
-   /** Acceleration (meters/sec/sec) of Target Spot. */
-   protected Vector3Float  targetSpotAcceleration = new Vector3Float(); 
-
-   /** Unique ID of the target entity. */
-   protected EntityID  targetEntityID = new EntityID(); 
-
-   /** Target Component ID ENUM, same as in DamageDescriptionRecord. */
-   protected byte  targetComponentID = (byte)0;
-
-   /** Spot Shape ENUM. uid 311 */
-   protected DEPrecisionAimpointBeamSpotType beamSpotType = DEPrecisionAimpointBeamSpotType.values()[0];
-
-   /** Beam Spot Cross Section Semi-Major Axis. */
-   protected float  beamSpotCrossSectionSemiMajorAxis = (float)0;
-
-   /** Beam Spot Cross Section Semi-Major Axis. */
-   protected float  beamSpotCrossSectionSemiMinorAxis = (float)0;
-
-   /** Beam Spot Cross Section Orientation Angle. */
-   protected float  beamSpotCrossSectionOrientationAngle = (float)0;
-
-   /** Peak irradiance */
-   protected float  peakIrradiance = (float)0;
-
-   /** padding */
-   protected int  padding2 = (int)0;
-
-
-/** Constructor */
- public DirectedEnergyPrecisionAimpoint()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // padding
-   marshalSize += targetSpotLocation.getMarshalledSize();
-   marshalSize += targetSpotEntityLocation.getMarshalledSize();
-   marshalSize += targetSpotVelocity.getMarshalledSize();
-   marshalSize += targetSpotAcceleration.getMarshalledSize();
-   marshalSize += targetEntityID.getMarshalledSize();
-   marshalSize += 1;  // targetComponentID
-   marshalSize += beamSpotType.getMarshalledSize();
-   marshalSize += 4;  // beamSpotCrossSectionSemiMajorAxis
-   marshalSize += 4;  // beamSpotCrossSectionSemiMinorAxis
-   marshalSize += 4;  // beamSpotCrossSectionOrientationAngle
-   marshalSize += 4;  // peakIrradiance
-   marshalSize += 4;  // padding2
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#recordType}*/
-public DirectedEnergyPrecisionAimpoint setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#recordLength}*/
-public DirectedEnergyPrecisionAimpoint setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#padding}*/
-public DirectedEnergyPrecisionAimpoint setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotLocation}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotLocation(Vector3Double pTargetSpotLocation)
-{
-    targetSpotLocation = pTargetSpotLocation;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotLocation}*/
-public Vector3Double getTargetSpotLocation()
-{
-    return targetSpotLocation; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotEntityLocation}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotEntityLocation(Vector3Float pTargetSpotEntityLocation)
-{
-    targetSpotEntityLocation = pTargetSpotEntityLocation;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotEntityLocation}*/
-public Vector3Float getTargetSpotEntityLocation()
-{
-    return targetSpotEntityLocation; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotVelocity}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotVelocity(Vector3Float pTargetSpotVelocity)
-{
-    targetSpotVelocity = pTargetSpotVelocity;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotVelocity}*/
-public Vector3Float getTargetSpotVelocity()
-{
-    return targetSpotVelocity; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotAcceleration}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotAcceleration(Vector3Float pTargetSpotAcceleration)
-{
-    targetSpotAcceleration = pTargetSpotAcceleration;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotAcceleration}*/
-public Vector3Float getTargetSpotAcceleration()
-{
-    return targetSpotAcceleration; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetEntityID}*/
-public DirectedEnergyPrecisionAimpoint setTargetEntityID(EntityID pTargetEntityID)
-{
-    targetEntityID = pTargetEntityID;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetEntityID}*/
-public EntityID getTargetEntityID()
-{
-    return targetEntityID; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetComponentID}*/
-public DirectedEnergyPrecisionAimpoint setTargetComponentID(byte pTargetComponentID)
-{
-    targetComponentID = pTargetComponentID;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetComponentID}*/
-public byte getTargetComponentID()
-{
-    return targetComponentID; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotType}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotType(DEPrecisionAimpointBeamSpotType pBeamSpotType)
-{
-    beamSpotType = pBeamSpotType;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotType}*/
-public DEPrecisionAimpointBeamSpotType getBeamSpotType()
-{
-    return beamSpotType; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMajorAxis}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionSemiMajorAxis(float pBeamSpotCrossSectionSemiMajorAxis)
-{
-    beamSpotCrossSectionSemiMajorAxis = pBeamSpotCrossSectionSemiMajorAxis;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMajorAxis}*/
-public float getBeamSpotCrossSectionSemiMajorAxis()
-{
-    return beamSpotCrossSectionSemiMajorAxis; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMinorAxis}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionSemiMinorAxis(float pBeamSpotCrossSectionSemiMinorAxis)
-{
-    beamSpotCrossSectionSemiMinorAxis = pBeamSpotCrossSectionSemiMinorAxis;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMinorAxis}*/
-public float getBeamSpotCrossSectionSemiMinorAxis()
-{
-    return beamSpotCrossSectionSemiMinorAxis; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionOrientationAngle}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionOrientationAngle(float pBeamSpotCrossSectionOrientationAngle)
-{
-    beamSpotCrossSectionOrientationAngle = pBeamSpotCrossSectionOrientationAngle;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionOrientationAngle}*/
-public float getBeamSpotCrossSectionOrientationAngle()
-{
-    return beamSpotCrossSectionOrientationAngle; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#peakIrradiance}*/
-public DirectedEnergyPrecisionAimpoint setPeakIrradiance(float pPeakIrradiance)
-{
-    peakIrradiance = pPeakIrradiance;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#peakIrradiance}*/
-public float getPeakIrradiance()
-{
-    return peakIrradiance; 
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#padding2}*/
-public DirectedEnergyPrecisionAimpoint setPadding2(int pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#padding2}*/
-public int getPadding2()
-{
-    return padding2; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordLength);
-       dos.writeShort(padding);
-       targetSpotLocation.marshal(dos);
-       targetSpotEntityLocation.marshal(dos);
-       targetSpotVelocity.marshal(dos);
-       targetSpotAcceleration.marshal(dos);
-       targetEntityID.marshal(dos);
-       dos.writeByte(targetComponentID);
-       beamSpotType.marshal(dos);
-       dos.writeFloat(beamSpotCrossSectionSemiMajorAxis);
-       dos.writeFloat(beamSpotCrossSectionSemiMinorAxis);
-       dos.writeFloat(beamSpotCrossSectionOrientationAngle);
-       dos.writeFloat(peakIrradiance);
-       dos.writeInt(padding2);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += targetSpotLocation.unmarshal(dis);
-        uPosition += targetSpotEntityLocation.unmarshal(dis);
-        uPosition += targetSpotVelocity.unmarshal(dis);
-        uPosition += targetSpotAcceleration.unmarshal(dis);
-        uPosition += targetEntityID.unmarshal(dis);
-        targetComponentID = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamSpotType = DEPrecisionAimpointBeamSpotType.unmarshalEnum(dis);
-        uPosition += beamSpotType.getMarshalledSize();
-        beamSpotCrossSectionSemiMajorAxis = dis.readFloat();
-        uPosition += 4;
-        beamSpotCrossSectionSemiMinorAxis = dis.readFloat();
-        uPosition += 4;
-        beamSpotCrossSectionOrientationAngle = dis.readFloat();
-        uPosition += 4;
-        peakIrradiance = dis.readFloat();
-        uPosition += 4;
-        padding2 = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)padding);
-   targetSpotLocation.marshal(buff);
-   targetSpotEntityLocation.marshal(buff);
-   targetSpotVelocity.marshal(buff);
-   targetSpotAcceleration.marshal(buff);
-   targetEntityID.marshal(buff);
-   buff.put( (byte)targetComponentID);
-   beamSpotType.marshal(buff);
-   buff.putFloat( (float)beamSpotCrossSectionSemiMajorAxis);
-   buff.putFloat( (float)beamSpotCrossSectionSemiMinorAxis);
-   buff.putFloat( (float)beamSpotCrossSectionOrientationAngle);
-   buff.putFloat( (float)peakIrradiance);
-   buff.putInt( (int)padding2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    targetSpotLocation.unmarshal(buff);
-    targetSpotEntityLocation.unmarshal(buff);
-    targetSpotVelocity.unmarshal(buff);
-    targetSpotAcceleration.unmarshal(buff);
-    targetEntityID.unmarshal(buff);
-    targetComponentID = (byte)(buff.get() & 0xFF);
-    beamSpotType = DEPrecisionAimpointBeamSpotType.unmarshalEnum(buff);
-    beamSpotCrossSectionSemiMajorAxis = buff.getFloat();
-    beamSpotCrossSectionSemiMinorAxis = buff.getFloat();
-    beamSpotCrossSectionOrientationAngle = buff.getFloat();
-    peakIrradiance = buff.getFloat();
-    padding2 = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DirectedEnergyPrecisionAimpoint rhs = (DirectedEnergyPrecisionAimpoint)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (targetSpotLocation.equals( rhs.targetSpotLocation) )) ivarsEqual = false;
-     if( ! (targetSpotEntityLocation.equals( rhs.targetSpotEntityLocation) )) ivarsEqual = false;
-     if( ! (targetSpotVelocity.equals( rhs.targetSpotVelocity) )) ivarsEqual = false;
-     if( ! (targetSpotAcceleration.equals( rhs.targetSpotAcceleration) )) ivarsEqual = false;
-     if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
-     if( ! (targetComponentID == rhs.targetComponentID)) ivarsEqual = false;
-     if( ! (beamSpotType == rhs.beamSpotType)) ivarsEqual = false;
-     if( ! (beamSpotCrossSectionSemiMajorAxis == rhs.beamSpotCrossSectionSemiMajorAxis)) ivarsEqual = false;
-     if( ! (beamSpotCrossSectionSemiMinorAxis == rhs.beamSpotCrossSectionSemiMinorAxis)) ivarsEqual = false;
-     if( ! (beamSpotCrossSectionOrientationAngle == rhs.beamSpotCrossSectionOrientationAngle)) ivarsEqual = false;
-     if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" targetSpotLocation: ").append(targetSpotLocation).append("\n");
-    sb.append(" targetSpotEntityLocation: ").append(targetSpotEntityLocation).append("\n");
-    sb.append(" targetSpotVelocity: ").append(targetSpotVelocity).append("\n");
-    sb.append(" targetSpotAcceleration: ").append(targetSpotAcceleration).append("\n");
-    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
-    sb.append(" targetComponentID: ").append(targetComponentID).append("\n");
-    sb.append(" beamSpotType: ").append(beamSpotType).append("\n");
-    sb.append(" beamSpotCrossSectionSemiMajorAxis: ").append(beamSpotCrossSectionSemiMajorAxis).append("\n");
-    sb.append(" beamSpotCrossSectionSemiMinorAxis: ").append(beamSpotCrossSectionSemiMinorAxis).append("\n");
-    sb.append(" beamSpotCrossSectionOrientationAngle: ").append(beamSpotCrossSectionOrientationAngle).append("\n");
-    sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
deleted file mode 100644
index 527dd405de25c5e8e8c139ca39f66bdd3e8a60ce..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * DE energy depostion properties for a target entity. Section 6.2.20.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class DirectedEnergyTargetEnergyDeposition extends Object implements Serializable
-{
-   /** Unique ID of the target entity. */
-   protected EntityID  targetEntityID = new EntityID(); 
-
-   /** padding */
-   protected short  padding = (short)0;
-
-   /** Peak irradiance */
-   protected float  peakIrradiance;
-
-
-/** Constructor */
- public DirectedEnergyTargetEnergyDeposition()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += targetEntityID.getMarshalledSize();
-   marshalSize += 2;  // padding
-   marshalSize += 4;  // peakIrradiance
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyTargetEnergyDeposition#targetEntityID}*/
-public DirectedEnergyTargetEnergyDeposition setTargetEntityID(EntityID pTargetEntityID)
-{
-    targetEntityID = pTargetEntityID;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyTargetEnergyDeposition#targetEntityID}*/
-public EntityID getTargetEntityID()
-{
-    return targetEntityID; 
-}
-
-/** Setter for {@link DirectedEnergyTargetEnergyDeposition#padding}*/
-public DirectedEnergyTargetEnergyDeposition setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyTargetEnergyDeposition#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link DirectedEnergyTargetEnergyDeposition#peakIrradiance}*/
-public DirectedEnergyTargetEnergyDeposition setPeakIrradiance(float pPeakIrradiance)
-{
-    peakIrradiance = pPeakIrradiance;
-    return this;
-}
-
-/** Getter for {@link DirectedEnergyTargetEnergyDeposition#peakIrradiance}*/
-public float getPeakIrradiance()
-{
-    return peakIrradiance; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       targetEntityID.marshal(dos);
-       dos.writeShort(padding);
-       dos.writeFloat(peakIrradiance);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += targetEntityID.unmarshal(dis);
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        peakIrradiance = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   targetEntityID.marshal(buff);
-   buff.putShort( (short)padding);
-   buff.putFloat( (float)peakIrradiance);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    targetEntityID.unmarshal(buff);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    peakIrradiance = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DirectedEnergyTargetEnergyDeposition rhs = (DirectedEnergyTargetEnergyDeposition)obj;
-
-     if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DisBitSet.java b/src-generated/edu/nps/moves/dis7/DisBitSet.java
deleted file mode 100644
index fe5a3e176d55938834255772d1a7dd288844dc98..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DisBitSet.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.BitSet;
-
-/**
-  * This class is backed by a Java library class, {@link java.util.BitSet}.  That class exports its
-  * byte array contents in little-endian order (least significant byte first).  The DIS spec requires
-  * the opposite, which is the default for "network byte order".
-*/
-public abstract class DisBitSet extends BitSet implements Marshaller
-{
-    private final int bitLength;
-    private final int byteLength;
-
-    public DisBitSet(int len)
-    {
-        super(len); // length from bitfield element
-        bitLength = len;
-        byteLength = (bitLength + Byte.SIZE - 1) / Byte.SIZE;
-    }
-
-    protected static int calculateMask(int position, int length)
-    {
-        int result = 0;
-        for (int i = position; i < position + length; i++) {
-            result |= (1 << i);
-        }
-        return result;
-    }
-
-    protected static int calculateMask(int length)
-    {
-        int ret = 0;
-        for (int i = 0; i < length; i++) {
-            ret |= 1 << i;
-        }
-        return ret;
-    }
-
-    protected void setbits(int pos, int len, int val)
-    {
-        try {
-            for (int i = pos, j = 0; i < pos + len; i++, j++) {
-                boolean isset = (val & (1 << j)) != 0;
-                set(i, i + 1, isset); // BitSet class
-            }
-        }
-        catch (Throwable t) {
-            showError(t);
-        }
-    }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-    @Override
-    public int getMarshalledSize()
-    {
-        return byteLength;
-    }
-
-    @Override
-    public void marshal(DataOutputStream dos)
-    {
-        try {
-            dos.write(marshallCommon());
-        }
-        catch (IOException ex) {
-            System.out.println(ex.getClass().getSimpleName() + ": " + ex.getMessage());
-        }
-    }
-
-    @Override
-    public void marshal(ByteBuffer buff)
-    {
-        buff.put(marshallCommon());
-    }
-
-    public byte[] marshallCommon()
-    {
-        byte[] ba = toByteArray();
-        // BitSet does not return an array equal in size to that passed to the constructor--it may be smaller.
-        // This will put 0's at the end
-        if (ba.length < byteLength)
-            ba = Arrays.copyOf(ba, byteLength);
-
-        return reverse(ba); // BitSet will return Little-Endian array, network byte order requires reverse
-    }
-
-    @Override
-    public int unmarshal(DataInputStream dis)
-    {
-        try {
-            byte[] ba = new byte[byteLength];
-            dis.readFully(ba);
-            unmarshalCommon(ba);
-        }
-        catch (IOException ex) {
-            showError(ex);
-        }
-        return getMarshalledSize();
-    }
-
-    @Override
-    public int unmarshal(ByteBuffer buff)
-    {
-        byte[] ba = new byte[byteLength];
-        buff.get(ba);
-        unmarshalCommon(ba);
-        
-        return getMarshalledSize();
-    }
-
-    private void unmarshalCommon(byte[] ba)
-    {
-        reverse(ba); // big endian to little
-
-        int bitnum = 0;
-        for (int i = 0; i < ba.length; i++) {
-            for (int j = 0; j < Byte.SIZE; j++) {
-                set(bitnum++, isBitSet(ba[i], j));
-            }
-        }
-    }
-
-    private boolean isBitSet(byte b, int bit)
-    {
-        return (b & (1 << bit)) != 0;
-    }
-
-    private byte[] reverse(byte[] ba)
-    {
-        int len = ba.length;
-        for (int i = 0; i < len / 2; i++) {
-            byte b = ba[i];
-            ba[i] = ba[len - 1 - i];
-            ba[len - 1 - i] = b;
-        }
-        return ba;
-    }
-
-    private void showError(Throwable ex)
-    {
-        System.err.println(ex.getClass().getSimpleName() + ": " + ex.getMessage());
-    }
-}
diff --git a/src-generated/edu/nps/moves/dis7/DisTime.java b/src-generated/edu/nps/moves/dis7/DisTime.java
deleted file mode 100644
index 906479313d4bd95a90de6a2bd06ef152c85901f4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DisTime.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-
-/**
- * DIS time units are a pain in the ass. DIS time units are arbitrary, and set
- * equal to 2^31 - 1 time units per hour. The DIS time is set to the number of time
- * units since the start of the hour. The timestamp field in the PDU header is
- * four bytes long and is specified to be an unsigned integer value.<p>
- *
- * There are two types of official timestamps in the PDU header: absolute time and
- * relative time. Absolute time is used when the host is sync'd to UTC, ie the host
- * has access to UTC via Network Time Protocol (NTP). This time can be legitimately
- * compared to the timestamp of packets received from other hosts, since they all
- * refer to the same universal time.<p>
- *
- * Relative timestamps are used when the host does NOT have access to NTP, and hence
- * the system time might not be coordinated with that of other hosts. This means that
- * a host receiving DIS packets from several hosts might have to set up a per-host
- * table to order packets, and that the PDU timestamp fields from one host is not
- * directly comparable to the PDU timestamp field from another host.
- *
- * Absolute timestamps have their LSB set to 1, and relative timestamps have their
- * LSB set to 0. The idea is to get the current time since the top of the hour,
- * divide by 2^31-1, shift left one bit, then set the LSB to either 0 for relative
- * timestamps or 1 for absolute timestamps.<p>
- *
- * The nature of the data is such that the timestamp fields will roll over once an
- * hour, and simulations must be prepared for that. Ie, at the top of the hour
- * outgoing PDUs will have a timestamp of 1, just before the end of the hour the
- * PDUs will have a timestamp of 2^31 - 1, and then they will roll back over to 1.
- * Receiving applications should expect this behavior, and not simply expect a
- * monotonically increasing timestamp field.<p>
- *
- * The official DIS timestamps don't work all that well in our (NPS's) applications,
- * which often expect a monotonically increasing timestamp field. To get around this,
- * we use hundreds of a second since the start of the year. The maximum value for
- * this field is 3,153,600,000, which can fit into an unsigned int. The resolution is
- * good enough for most applications, and you typically don't have to worry about
- * rollover, instead getting only a monotonically increasing timestamp value.<p>
- *
- * Note that many applications in the wild have been known to completely ignore
- * the standard and to simply put the Unix time (seconds since 1970) into the
- * field. <p>
- *
- * You need to be careful with the shared instance of this class--I'm not at all
- * convinced it is thread safe. If you are using multiple threads, I suggest you
- * create a new instance of the class for each thread to prevent the values from
- * getting stomped on.<p>
- * 
- * Shared singleton removed.  Mike Bailey, 14 June 2019
- * 
- * @author DMcG
- */
-public class DisTime
-{
-
-    public static final int ABSOLUTE_TIMESTAMP_MASK = 0x00000001;
-    public static final int RELATIVE_TIMESTAMP_MASK = 0xfffffffe;
-    protected GregorianCalendar cal;
-
-   // public static DisTime disTime = null;
-
-    /**
-     * Shared instance. This is not thread-safe. If you are working in multiple threads,
-     * create a new instance for each thread.
-     * return singleton instance of DisTime
-     */
-   /* public static DisTime getInstance()
-    {
-        if (disTime == null) {
-            disTime = new DisTime();
-        }
-
-        return disTime;
-    }
-*/
-    public DisTime()
-    {
-        cal = new GregorianCalendar();
-    }
-
-    /**
-     * Returns the number of DIS time units since the top of the hour. there are 2^31-1 DIS time
-     * units per hour.
-     * @return integer DIS time units since the start of the hour.
-     */
-    private int getDisTimeUnitsSinceTopOfHour() {
-        // set cal object to current time
-        long currentTime = System.currentTimeMillis(); // UTC milliseconds since 1970
-        cal.setTimeInMillis(currentTime);
-
-        // Set cal to top of the hour, then compute what the cal object says was milliseconds since 1970
-        // at the top of the hour
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.SECOND, 0);
-        cal.set(Calendar.MILLISECOND, 0);
-        long topOfHour = cal.getTimeInMillis();
-
-        // Milliseconds since the top of the hour
-        long diff = currentTime - topOfHour;
-
-        // It turns out that Integer.MAX_VALUE is 2^31-1, which is the time unit value, ie there are
-        // 2^31-1 DIS time units in an hour. 3600 sec/hr X 1000 msec/sec divided into the number of
-        // msec since the start of the hour gives the percentage of DIS time units in the hour, times
-        // the number of DIS time units per hour, equals the time value
-        double val = (diff / (3600.0 * 1000.0)) * Integer.MAX_VALUE;
-        int ts = (int) val;
-
-        return ts;
-    }
-
-    /**
-     * Returns the absolute timestamp, assuming that this host is sync'd to NTP.
-     * Fix to bitshift by mvormelch.
-     * @return DIS time units, get absolute timestamp
-     */
-
-    public int getDisAbsoluteTimestamp() {
-         int val = this.getDisTimeUnitsSinceTopOfHour();
-         val = (val << 1) | ABSOLUTE_TIMESTAMP_MASK; // always flip the lsb to 1
-         return val;
-    }
-
-    /**
-     * Returns the DIS standard relative timestamp, which should be used if this host
-     * is not slaved to NTP. Fix to bitshift by mvormelch
-     * @return DIS time units, relative
-     */
-    public int getDisRelativeTimestamp() {
-        int val = this.getDisTimeUnitsSinceTopOfHour();
-        val = (val << 1) & RELATIVE_TIMESTAMP_MASK; // always flip the lsb to 0
-        return val;
-    }
-
-    /**
-     * Returns a useful timestamp, hundredths of a second since the start of the year.
-     * This effectively eliminates the need for receivers to handle timestamp rollover,
-     * as long as you're not working on New Year's Eve.
-     * @return a timestamp in hundredths of a second since the start of the year
-     */
-    public long getNpsTimestamp() {
-        // set cal object to current time
-        long currentTime = System.currentTimeMillis(); // UTC milliseconds since 1970
-        cal.setTimeInMillis(currentTime);
-
-        // Set cal to the start of the year
-        cal.set(Calendar.MONTH, 0);
-        cal.set(Calendar.DAY_OF_MONTH, 1);
-        cal.set(Calendar.HOUR, 0);
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.SECOND, 0);
-        cal.set(Calendar.MILLISECOND, 0);
-        long startOfYear = cal.getTimeInMillis();
-
-        // Milliseconds since the top of the hour
-        long diff = currentTime - startOfYear;
-        diff /= 10; // milliseconds to hundredths of a second
-
-        return diff;
-    }
-
-    /**
-     * Another option for marshalling with the timestamp field set automatically. The UNIX
-     * time is conventionally seconds since January 1, 1970. UTC time is used, and leap seconds
-     * are excluded. This approach is popular in the wild, but the time resolution is not very
-     * good for high frequency updates, such as aircraft. An entity updating at 30 PDUs/second
-     * would see 30 PDUs sent out with the same timestamp, and have 29 of them discarded as
-     * duplicate packets.
-     *
-     * Note that there are other "Unix times", such milliseconds since 1/1/1970, saved in a long.
-     * This cannot be used, since the value is saved in a long. Java's System.getCurrentTimeMillis()
-     * uses this value.
-     *
-     * Unix time (in seconds) rolls over in 2038. 
-     *
-     * See the wikipedia page on Unix time for gory details. 
-     * @return seconds since 1970
-     */
-    public long getUnixTimestamp() {
-        long t = System.currentTimeMillis();
-        t = t / 1000l;   // NB: integer division, convert milliseconds to seconds
-        return t;
-    }
-}
\ No newline at end of file
diff --git a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
deleted file mode 100644
index a1596a7ad2dd13b602564f0b8394561316f14083..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.7. Electronic Emissions. Abstract superclass for distributed emissions PDU
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class DistributedEmissionsFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public DistributedEmissionsFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.DISTRIBUTED_EMISSION_REGENERATION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final DistributedEmissionsFamilyPdu rhs = (DistributedEmissionsFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Domain.java b/src-generated/edu/nps/moves/dis7/Domain.java
deleted file mode 100644
index eed1c8982697355dd43da5f02a3e2b3f0fbe74c3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Domain.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-package edu.nps.moves.dis7;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.lang.reflect.Method;
-import java.nio.ByteBuffer;
-import java.lang.reflect.InvocationTargetException;
-
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An example approximating a Java enum "superclass". Can't use an interface, because we need the two
- * static methods, which can't go into an interface
- */
-public class Domain
-{
-  private Domain()
-  {
-  }
-
-  private Object enumInst;
-
-  private Method mSize;
-  private Method marshalBuff;
-  private Method marshalDos;
-  private Method unmarshalBuff;
-  private Method unmarshalDis;
-  private Method getValue;
-  private Method getDescription;
-
-  //@formatter:off
-
-    /**
-     *
-     * @param d
-     * @return
-     */
-  public static Domain inst(PlatformDomain d)
-  {
-    return _inst(d);
-  }  //  uid 8
-
-    /**
-     *
-     * @param d
-     * @return
-     */
-    public static Domain inst(MunitionDomain d)
-  {
-    return _inst(d);
-  }  //  uid 14
-
-    /**
-     *
-     * @param d
-     * @return
-     */
-    public static Domain inst(SupplyDomain d)
-  {
-    return _inst(d);
-  }  //  uid 600
-
-  //@formatter:on
-  private static Domain _inst(Object o)
-  {
-    Domain d = new Domain();
-    d.enumInst = o;
-    d.init();
-    return d;
-  }
-
-  private void init()
-  {
-    Class<?> c = enumInst.getClass();
-    try {
-      //@formatter:off
-      marshalBuff = c.getDeclaredMethod("marshal", new Class[]{ByteBuffer.class});
-      marshalDos = c.getDeclaredMethod("marshal", new Class[]{DataOutputStream.class});
-      unmarshalBuff = c.getDeclaredMethod("unmarshalEnum", new Class[]{ByteBuffer.class});
-      unmarshalDis = c.getDeclaredMethod("unmarshalEnum", new Class[]{DataInputStream.class});
-      mSize = c.getDeclaredMethod("getMarshalledSize", (Class[]) null);
-      getValue = c.getDeclaredMethod("getValue", (Class[]) null);
-      getDescription = c.getDeclaredMethod("getDescription", (Class[]) null);
-      //@formatter:on
-    }
-    catch (NoSuchMethodException ex) {
-      System.err.println("Can't find methods in " + c.getSimpleName());
-    }
-  }
-
-    /**
-     *
-     * @return
-     */
-    public int getValue()
-  {
-    return (Integer) invoke(getValue, null);
-  }
-
-    /**
-     *
-     * @return
-     */
-    public String getDescription()
-  {
-    return (String) invoke(getDescription, null);
-  }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-    public int getMarshalledSize()
-    {
-      return (Integer) invoke(mSize, null);
-    }
-
-    /**
-     *
-     * @param dos
-     */
-    public void marshal(DataOutputStream dos)
-  {
-    invoke(marshalDos, new Object[]{dos});
-  }
-
-    /**
-     *
-     * @param buff
-     */
-    public void marshal(ByteBuffer buff)
-  {
-    invoke(marshalBuff, new Object[]{buff});
-  }
-
-    /**
-     *
-     * @param dis
-     * @return
-     */
-    public int unmarshal(DataInputStream dis)
-  {
-    Object o = invoke(unmarshalDis, new Object[]{dis});
-    enumInst = o;
-    init();
-    return getMarshalledSize();
-  }
-
-    /**
-     *
-     * @param buff
-     * @return
-     */
-    public int unmarshal(ByteBuffer buff)
-  {
-    Object o = invoke(unmarshalBuff, new Object[]{buff});
-    enumInst = o;
-    init();
-    return getMarshalledSize();
-  }
-
-  private Object invoke(Method m, Object[] oa)
-  {
-    try {
-      return m.invoke(enumInst, oa);
-    }
-    catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
-      throw new RuntimeException("bad " + m.getName());
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return getDescription();
-  }
-
-  /*
-   * Override of default equals method.  Calls equalsImpl() for content comparison.
-   */
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (this == obj)
-      return true;
-
-    if (obj == null)
-      return false;
-
-    if (getClass() != obj.getClass())
-      return false;
-
-    return equalsImpl(obj);
-  }
-
-  /**
-   * Compare all fields that contribute to the state, ignoring
-   * transient and static fields, for <code>this</code> and the supplied object
-   *
-   * @param obj the object to compare to
-   * @return true if the objects are equal, false otherwise.
-   */
-  public boolean equalsImpl(Object obj)
-  {
-    final Domain rhs = (Domain) obj;
-    return enumInst.equals(rhs.enumInst);
-  }
-}
diff --git a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
deleted file mode 100644
index 1675c640e5e203a97476046a3e49f77086ad29c8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EEFundamentalParameterData extends Object implements Serializable
-{
-   /** center frequency of the emission in hertz. */
-   protected float  frequency;
-
-   /** Bandwidth of the frequencies corresponding to the fequency field. */
-   protected float  frequencyRange;
-
-   /** Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power. */
-   protected float  effectiveRadiatedPower;
-
-   /** Average repetition frequency of the emission in hertz. */
-   protected float  pulseRepetitionFrequency;
-
-   /** Average pulse width  of the emission in microseconds. */
-   protected float  pulseWidth;
-
-
-/** Constructor */
- public EEFundamentalParameterData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // frequency
-   marshalSize += 4;  // frequencyRange
-   marshalSize += 4;  // effectiveRadiatedPower
-   marshalSize += 4;  // pulseRepetitionFrequency
-   marshalSize += 4;  // pulseWidth
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EEFundamentalParameterData#frequency}*/
-public EEFundamentalParameterData setFrequency(float pFrequency)
-{
-    frequency = pFrequency;
-    return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#frequency}*/
-public float getFrequency()
-{
-    return frequency; 
-}
-
-/** Setter for {@link EEFundamentalParameterData#frequencyRange}*/
-public EEFundamentalParameterData setFrequencyRange(float pFrequencyRange)
-{
-    frequencyRange = pFrequencyRange;
-    return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#frequencyRange}*/
-public float getFrequencyRange()
-{
-    return frequencyRange; 
-}
-
-/** Setter for {@link EEFundamentalParameterData#effectiveRadiatedPower}*/
-public EEFundamentalParameterData setEffectiveRadiatedPower(float pEffectiveRadiatedPower)
-{
-    effectiveRadiatedPower = pEffectiveRadiatedPower;
-    return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#effectiveRadiatedPower}*/
-public float getEffectiveRadiatedPower()
-{
-    return effectiveRadiatedPower; 
-}
-
-/** Setter for {@link EEFundamentalParameterData#pulseRepetitionFrequency}*/
-public EEFundamentalParameterData setPulseRepetitionFrequency(float pPulseRepetitionFrequency)
-{
-    pulseRepetitionFrequency = pPulseRepetitionFrequency;
-    return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#pulseRepetitionFrequency}*/
-public float getPulseRepetitionFrequency()
-{
-    return pulseRepetitionFrequency; 
-}
-
-/** Setter for {@link EEFundamentalParameterData#pulseWidth}*/
-public EEFundamentalParameterData setPulseWidth(float pPulseWidth)
-{
-    pulseWidth = pPulseWidth;
-    return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#pulseWidth}*/
-public float getPulseWidth()
-{
-    return pulseWidth; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(frequency);
-       dos.writeFloat(frequencyRange);
-       dos.writeFloat(effectiveRadiatedPower);
-       dos.writeFloat(pulseRepetitionFrequency);
-       dos.writeFloat(pulseWidth);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        frequency = dis.readFloat();
-        uPosition += 4;
-        frequencyRange = dis.readFloat();
-        uPosition += 4;
-        effectiveRadiatedPower = dis.readFloat();
-        uPosition += 4;
-        pulseRepetitionFrequency = dis.readFloat();
-        uPosition += 4;
-        pulseWidth = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)frequency);
-   buff.putFloat( (float)frequencyRange);
-   buff.putFloat( (float)effectiveRadiatedPower);
-   buff.putFloat( (float)pulseRepetitionFrequency);
-   buff.putFloat( (float)pulseWidth);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    frequency = buff.getFloat();
-    frequencyRange = buff.getFloat();
-    effectiveRadiatedPower = buff.getFloat();
-    pulseRepetitionFrequency = buff.getFloat();
-    pulseWidth = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EEFundamentalParameterData rhs = (EEFundamentalParameterData)obj;
-
-     if( ! (frequency == rhs.frequency)) ivarsEqual = false;
-     if( ! (frequencyRange == rhs.frequencyRange)) ivarsEqual = false;
-     if( ! (effectiveRadiatedPower == rhs.effectiveRadiatedPower)) ivarsEqual = false;
-     if( ! (pulseRepetitionFrequency == rhs.pulseRepetitionFrequency)) ivarsEqual = false;
-     if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" frequency: ").append(frequency).append("\n");
-    sb.append(" frequencyRange: ").append(frequencyRange).append("\n");
-    sb.append(" effectiveRadiatedPower: ").append(effectiveRadiatedPower).append("\n");
-    sb.append(" pulseRepetitionFrequency: ").append(pulseRepetitionFrequency).append("\n");
-    sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
deleted file mode 100644
index f078df5411a3abb1fc7fb1290a5fe356d07080ea..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.2 Communicate active electromagnetic emissions, including radar and radar-related electronic warfare (e.g., jamming). Exceptions include IFF interrogations and replies, navigation aids, voice, beacon and data radio communications, directed energy weapons, and laser ranging and designation systems, which are handled by other PDUs. Section 5.3.7.1.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ElectromagneticEmissionPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
-   /** ID of the entity emitting */
-   protected EntityID  emittingEntityID = new EntityID(); 
-
-   /** ID of event */
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)]. uid 77 */
-   protected ElectromagneticEmissionStateUpdateIndicator stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.values()[0];
-
-   /** This field shall specify the number of emission systems being described in the current PDU. */
-   protected byte  numberOfSystems;
-
-   /** padding */
-   protected short  paddingForEmissionsPdu;
-
-   /** Electronic emmissions systems */
-   protected List< ElectronicEmitter > systems = new ArrayList< ElectronicEmitter >();
- 
-
-/** Constructor */
- public ElectromagneticEmissionPdu()
- {
-    setPduType( DISPDUType.ELECTROMAGNETIC_EMISSION );
-    setPaddingForEmissionsPdu( (short)0 );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += emittingEntityID.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += stateUpdateIndicator.getMarshalledSize();
-   marshalSize += 1;  // numberOfSystems
-   marshalSize += 2;  // paddingForEmissionsPdu
-   for(int idx=0; idx < systems.size(); idx++)
-   {
-        ElectronicEmitter listElement = systems.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ElectromagneticEmissionPdu#emittingEntityID}*/
-public ElectromagneticEmissionPdu setEmittingEntityID(EntityID pEmittingEntityID)
-{
-    emittingEntityID = pEmittingEntityID;
-    return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#emittingEntityID}*/
-public EntityID getEmittingEntityID()
-{
-    return emittingEntityID; 
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#eventID}*/
-public ElectromagneticEmissionPdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#stateUpdateIndicator}*/
-public ElectromagneticEmissionPdu setStateUpdateIndicator(ElectromagneticEmissionStateUpdateIndicator pStateUpdateIndicator)
-{
-    stateUpdateIndicator = pStateUpdateIndicator;
-    return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#stateUpdateIndicator}*/
-public ElectromagneticEmissionStateUpdateIndicator getStateUpdateIndicator()
-{
-    return stateUpdateIndicator; 
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#paddingForEmissionsPdu}*/
-public ElectromagneticEmissionPdu setPaddingForEmissionsPdu(short pPaddingForEmissionsPdu)
-{
-    paddingForEmissionsPdu = pPaddingForEmissionsPdu;
-    return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#paddingForEmissionsPdu}*/
-public short getPaddingForEmissionsPdu()
-{
-    return paddingForEmissionsPdu; 
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#systems}*/
-public ElectromagneticEmissionPdu setSystems(List<ElectronicEmitter> pSystems)
-{
-    systems = pSystems;
-    return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#systems}*/
-public List<ElectronicEmitter> getSystems()
-{
-    return systems; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       emittingEntityID.marshal(dos);
-       eventID.marshal(dos);
-       stateUpdateIndicator.marshal(dos);
-       dos.writeByte(systems.size());
-       dos.writeShort(paddingForEmissionsPdu);
-
-       for(int idx = 0; idx < systems.size(); idx++)
-       {
-            ElectronicEmitter aElectronicEmitter = systems.get(idx);
-            aElectronicEmitter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += emittingEntityID.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.unmarshalEnum(dis);
-        uPosition += stateUpdateIndicator.getMarshalledSize();
-        numberOfSystems = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        paddingForEmissionsPdu = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfSystems; idx++)
-        {
-            ElectronicEmitter anX = new ElectronicEmitter();
-            uPosition += anX.unmarshal(dis);
-            systems.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   emittingEntityID.marshal(buff);
-   eventID.marshal(buff);
-   stateUpdateIndicator.marshal(buff);
-   buff.put( (byte)systems.size());
-   buff.putShort( (short)paddingForEmissionsPdu);
-
-   for(int idx = 0; idx < systems.size(); idx++)
-   {
-        ElectronicEmitter aElectronicEmitter = systems.get(idx);
-        aElectronicEmitter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    emittingEntityID.unmarshal(buff);
-    eventID.unmarshal(buff);
-    stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.unmarshalEnum(buff);
-    numberOfSystems = (byte)(buff.get() & 0xFF);
-    paddingForEmissionsPdu = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfSystems; idx++)
-    {
-    ElectronicEmitter anX = new ElectronicEmitter();
-    anX.unmarshal(buff);
-    systems.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ElectromagneticEmissionPdu rhs = (ElectromagneticEmissionPdu)obj;
-
-     if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (stateUpdateIndicator == rhs.stateUpdateIndicator)) ivarsEqual = false;
-     if( ! (paddingForEmissionsPdu == rhs.paddingForEmissionsPdu)) ivarsEqual = false;
-
-     for(int idx = 0; idx < systems.size(); idx++)
-        if( ! ( systems.get(idx).equals(rhs.systems.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" stateUpdateIndicator: ").append(stateUpdateIndicator).append("\n");
-    sb.append(" paddingForEmissionsPdu: ").append(paddingForEmissionsPdu).append("\n");
-    sb.append(" systems: ").append("\n");
-    systems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
deleted file mode 100644
index 1b9a647b92c87ca24593c9e445406636346b0fbc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ElectronicEmitter extends Object implements Serializable
-{
-   /**  this field shall specify the length of this emitter system's data in 32-bit words. */
-   protected byte  systemDataLength;
-
-   /** the number of beams being described in the current PDU for the emitter system being described.  */
-   protected byte  numberOfBeams;
-
-   /**  information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23). */
-   protected EmitterSystem  emitterSystem = new EmitterSystem(); 
-
-   /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95  */
-   protected Vector3Float  location = new Vector3Float(); 
-
-   /** Electronic emmission beams */
-   protected List< EmitterBeam > beams = new ArrayList< EmitterBeam >();
- 
-
-/** Constructor */
- public ElectronicEmitter()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // systemDataLength
-   marshalSize += 1;  // numberOfBeams
-   marshalSize += emitterSystem.getMarshalledSize();
-   marshalSize += location.getMarshalledSize();
-   for(int idx=0; idx < beams.size(); idx++)
-   {
-        EmitterBeam listElement = beams.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ElectronicEmitter#systemDataLength}*/
-public ElectronicEmitter setSystemDataLength(byte pSystemDataLength)
-{
-    systemDataLength = pSystemDataLength;
-    return this;
-}
-
-/** Getter for {@link ElectronicEmitter#systemDataLength}*/
-public byte getSystemDataLength()
-{
-    return systemDataLength; 
-}
-
-/** Setter for {@link ElectronicEmitter#emitterSystem}*/
-public ElectronicEmitter setEmitterSystem(EmitterSystem pEmitterSystem)
-{
-    emitterSystem = pEmitterSystem;
-    return this;
-}
-
-/** Getter for {@link ElectronicEmitter#emitterSystem}*/
-public EmitterSystem getEmitterSystem()
-{
-    return emitterSystem; 
-}
-
-/** Setter for {@link ElectronicEmitter#location}*/
-public ElectronicEmitter setLocation(Vector3Float pLocation)
-{
-    location = pLocation;
-    return this;
-}
-
-/** Getter for {@link ElectronicEmitter#location}*/
-public Vector3Float getLocation()
-{
-    return location; 
-}
-
-/** Setter for {@link ElectronicEmitter#beams}*/
-public ElectronicEmitter setBeams(List<EmitterBeam> pBeams)
-{
-    beams = pBeams;
-    return this;
-}
-
-/** Getter for {@link ElectronicEmitter#beams}*/
-public List<EmitterBeam> getBeams()
-{
-    return beams; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(systemDataLength);
-       dos.writeByte(beams.size());
-       emitterSystem.marshal(dos);
-       location.marshal(dos);
-
-       for(int idx = 0; idx < beams.size(); idx++)
-       {
-            EmitterBeam aEmitterBeam = beams.get(idx);
-            aEmitterBeam.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        systemDataLength = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfBeams = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += emitterSystem.unmarshal(dis);
-        uPosition += location.unmarshal(dis);
-        for(int idx = 0; idx < numberOfBeams; idx++)
-        {
-            EmitterBeam anX = new EmitterBeam();
-            uPosition += anX.unmarshal(dis);
-            beams.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)systemDataLength);
-   buff.put( (byte)beams.size());
-   emitterSystem.marshal(buff);
-   location.marshal(buff);
-
-   for(int idx = 0; idx < beams.size(); idx++)
-   {
-        EmitterBeam aEmitterBeam = beams.get(idx);
-        aEmitterBeam.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    systemDataLength = (byte)(buff.get() & 0xFF);
-    numberOfBeams = (byte)(buff.get() & 0xFF);
-    emitterSystem.unmarshal(buff);
-    location.unmarshal(buff);
-    for(int idx = 0; idx < numberOfBeams; idx++)
-    {
-    EmitterBeam anX = new EmitterBeam();
-    anX.unmarshal(buff);
-    beams.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ElectronicEmitter rhs = (ElectronicEmitter)obj;
-
-     if( ! (systemDataLength == rhs.systemDataLength)) ivarsEqual = false;
-     if( ! (emitterSystem.equals( rhs.emitterSystem) )) ivarsEqual = false;
-     if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < beams.size(); idx++)
-        if( ! ( beams.get(idx).equals(rhs.beams.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
-    sb.append(" emitterSystem: ").append(emitterSystem).append("\n");
-    sb.append(" location: ").append(location).append("\n");
-    sb.append(" beams: ").append("\n");
-    beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EmitterBeam.java b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
deleted file mode 100644
index bffdd1b904d55290cadc0bdf8e4c31dd9adc1d6e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EmitterBeam.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EmitterBeam extends Object implements Serializable
-{
-   protected byte  beamDataLength;
-
-   protected byte  beamNumber;
-
-   protected short  beamParameterIndex;
-
-   protected EEFundamentalParameterData  fundamentalParameterData = new EEFundamentalParameterData(); 
-
-   protected BeamData  beamData = new BeamData(); 
-
-   /**  uid 78 */
-   protected ElectromagneticEmissionBeamFunction beamFunction = ElectromagneticEmissionBeamFunction.values()[0];
-
-   protected byte  numberOfTargets;
-
-   /**  uid 79 */
-   protected HighDensityTrackJam highDensityTrackJam = HighDensityTrackJam.values()[0];
-
-   protected BeamStatus  beamStatus = new BeamStatus(); 
-
-   protected JammingTechnique  jammingTechnique = new JammingTechnique(); 
-
-   protected List< TrackJamData > trackJamData = new ArrayList< TrackJamData >();
- 
-
-/** Constructor */
- public EmitterBeam()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // beamDataLength
-   marshalSize += 1;  // beamNumber
-   marshalSize += 2;  // beamParameterIndex
-   marshalSize += fundamentalParameterData.getMarshalledSize();
-   marshalSize += beamData.getMarshalledSize();
-   marshalSize += beamFunction.getMarshalledSize();
-   marshalSize += 1;  // numberOfTargets
-   marshalSize += highDensityTrackJam.getMarshalledSize();
-   marshalSize += beamStatus.getMarshalledSize();
-   marshalSize += jammingTechnique.getMarshalledSize();
-   for(int idx=0; idx < trackJamData.size(); idx++)
-   {
-        TrackJamData listElement = trackJamData.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EmitterBeam#beamDataLength}*/
-public EmitterBeam setBeamDataLength(byte pBeamDataLength)
-{
-    beamDataLength = pBeamDataLength;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#beamDataLength}*/
-public byte getBeamDataLength()
-{
-    return beamDataLength; 
-}
-
-/** Setter for {@link EmitterBeam#beamNumber}*/
-public EmitterBeam setBeamNumber(byte pBeamNumber)
-{
-    beamNumber = pBeamNumber;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#beamNumber}*/
-public byte getBeamNumber()
-{
-    return beamNumber; 
-}
-
-/** Setter for {@link EmitterBeam#beamParameterIndex}*/
-public EmitterBeam setBeamParameterIndex(short pBeamParameterIndex)
-{
-    beamParameterIndex = pBeamParameterIndex;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#beamParameterIndex}*/
-public short getBeamParameterIndex()
-{
-    return beamParameterIndex; 
-}
-
-/** Setter for {@link EmitterBeam#fundamentalParameterData}*/
-public EmitterBeam setFundamentalParameterData(EEFundamentalParameterData pFundamentalParameterData)
-{
-    fundamentalParameterData = pFundamentalParameterData;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#fundamentalParameterData}*/
-public EEFundamentalParameterData getFundamentalParameterData()
-{
-    return fundamentalParameterData; 
-}
-
-/** Setter for {@link EmitterBeam#beamData}*/
-public EmitterBeam setBeamData(BeamData pBeamData)
-{
-    beamData = pBeamData;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#beamData}*/
-public BeamData getBeamData()
-{
-    return beamData; 
-}
-
-/** Setter for {@link EmitterBeam#beamFunction}*/
-public EmitterBeam setBeamFunction(ElectromagneticEmissionBeamFunction pBeamFunction)
-{
-    beamFunction = pBeamFunction;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#beamFunction}*/
-public ElectromagneticEmissionBeamFunction getBeamFunction()
-{
-    return beamFunction; 
-}
-
-/** Setter for {@link EmitterBeam#highDensityTrackJam}*/
-public EmitterBeam setHighDensityTrackJam(HighDensityTrackJam pHighDensityTrackJam)
-{
-    highDensityTrackJam = pHighDensityTrackJam;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#highDensityTrackJam}*/
-public HighDensityTrackJam getHighDensityTrackJam()
-{
-    return highDensityTrackJam; 
-}
-
-/** Setter for {@link EmitterBeam#beamStatus}*/
-public EmitterBeam setBeamStatus(BeamStatus pBeamStatus)
-{
-    beamStatus = pBeamStatus;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#beamStatus}*/
-public BeamStatus getBeamStatus()
-{
-    return beamStatus; 
-}
-
-/** Setter for {@link EmitterBeam#jammingTechnique}*/
-public EmitterBeam setJammingTechnique(JammingTechnique pJammingTechnique)
-{
-    jammingTechnique = pJammingTechnique;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#jammingTechnique}*/
-public JammingTechnique getJammingTechnique()
-{
-    return jammingTechnique; 
-}
-
-/** Setter for {@link EmitterBeam#trackJamData}*/
-public EmitterBeam setTrackJamData(List<TrackJamData> pTrackJamData)
-{
-    trackJamData = pTrackJamData;
-    return this;
-}
-
-/** Getter for {@link EmitterBeam#trackJamData}*/
-public List<TrackJamData> getTrackJamData()
-{
-    return trackJamData; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(beamDataLength);
-       dos.writeByte(beamNumber);
-       dos.writeShort(beamParameterIndex);
-       fundamentalParameterData.marshal(dos);
-       beamData.marshal(dos);
-       beamFunction.marshal(dos);
-       dos.writeByte(trackJamData.size());
-       highDensityTrackJam.marshal(dos);
-       beamStatus.marshal(dos);
-       jammingTechnique.marshal(dos);
-
-       for(int idx = 0; idx < trackJamData.size(); idx++)
-       {
-            TrackJamData aTrackJamData = trackJamData.get(idx);
-            aTrackJamData.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        beamDataLength = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamParameterIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += fundamentalParameterData.unmarshal(dis);
-        uPosition += beamData.unmarshal(dis);
-        beamFunction = ElectromagneticEmissionBeamFunction.unmarshalEnum(dis);
-        uPosition += beamFunction.getMarshalledSize();
-        numberOfTargets = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        highDensityTrackJam = HighDensityTrackJam.unmarshalEnum(dis);
-        uPosition += highDensityTrackJam.getMarshalledSize();
-        uPosition += beamStatus.unmarshal(dis);
-        uPosition += jammingTechnique.unmarshal(dis);
-        for(int idx = 0; idx < numberOfTargets; idx++)
-        {
-            TrackJamData anX = new TrackJamData();
-            uPosition += anX.unmarshal(dis);
-            trackJamData.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)beamDataLength);
-   buff.put( (byte)beamNumber);
-   buff.putShort( (short)beamParameterIndex);
-   fundamentalParameterData.marshal(buff);
-   beamData.marshal(buff);
-   beamFunction.marshal(buff);
-   buff.put( (byte)trackJamData.size());
-   highDensityTrackJam.marshal(buff);
-   beamStatus.marshal(buff);
-   jammingTechnique.marshal(buff);
-
-   for(int idx = 0; idx < trackJamData.size(); idx++)
-   {
-        TrackJamData aTrackJamData = trackJamData.get(idx);
-        aTrackJamData.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    beamDataLength = (byte)(buff.get() & 0xFF);
-    beamNumber = (byte)(buff.get() & 0xFF);
-    beamParameterIndex = (short)(buff.getShort() & 0xFFFF);
-    fundamentalParameterData.unmarshal(buff);
-    beamData.unmarshal(buff);
-    beamFunction = ElectromagneticEmissionBeamFunction.unmarshalEnum(buff);
-    numberOfTargets = (byte)(buff.get() & 0xFF);
-    highDensityTrackJam = HighDensityTrackJam.unmarshalEnum(buff);
-    beamStatus.unmarshal(buff);
-    jammingTechnique.unmarshal(buff);
-    for(int idx = 0; idx < numberOfTargets; idx++)
-    {
-    TrackJamData anX = new TrackJamData();
-    anX.unmarshal(buff);
-    trackJamData.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EmitterBeam rhs = (EmitterBeam)obj;
-
-     if( ! (beamDataLength == rhs.beamDataLength)) ivarsEqual = false;
-     if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
-     if( ! (beamParameterIndex == rhs.beamParameterIndex)) ivarsEqual = false;
-     if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
-     if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
-     if( ! (beamFunction == rhs.beamFunction)) ivarsEqual = false;
-     if( ! (highDensityTrackJam == rhs.highDensityTrackJam)) ivarsEqual = false;
-     if( ! (beamStatus.equals( rhs.beamStatus) )) ivarsEqual = false;
-     if( ! (jammingTechnique.equals( rhs.jammingTechnique) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < trackJamData.size(); idx++)
-        if( ! ( trackJamData.get(idx).equals(rhs.trackJamData.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
-    sb.append(" beamNumber: ").append(beamNumber).append("\n");
-    sb.append(" beamParameterIndex: ").append(beamParameterIndex).append("\n");
-    sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
-    sb.append(" beamData: ").append(beamData).append("\n");
-    sb.append(" beamFunction: ").append(beamFunction).append("\n");
-    sb.append(" highDensityTrackJam: ").append(highDensityTrackJam).append("\n");
-    sb.append(" beamStatus: ").append(beamStatus).append("\n");
-    sb.append(" jammingTechnique: ").append(jammingTechnique).append("\n");
-    sb.append(" trackJamData: ").append("\n");
-    trackJamData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EmitterSystem.java b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
deleted file mode 100644
index 0730a045e17aef1fe73cab6ac8699d3b766e78db..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EmitterSystem.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * This field shall specify information about a particular emitter system. Section 6.2.23.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EmitterSystem extends Object implements Serializable
-{
-   /** Name of the emitter, 16 bit enumeration uid 75 */
-   protected EmitterName emitterName = EmitterName.values()[0];
-
-   /** function of the emitter, 8 bit enumeration uid 76 */
-   protected EmitterSystemFunction emitterFunction = EmitterSystemFunction.values()[0];
-
-   /** emitter ID, 8 bit enumeration */
-   protected byte  emitterIDNumber;
-
-
-/** Constructor */
- public EmitterSystem()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += emitterName.getMarshalledSize();
-   marshalSize += emitterFunction.getMarshalledSize();
-   marshalSize += 1;  // emitterIDNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EmitterSystem#emitterName}*/
-public EmitterSystem setEmitterName(EmitterName pEmitterName)
-{
-    emitterName = pEmitterName;
-    return this;
-}
-
-/** Getter for {@link EmitterSystem#emitterName}*/
-public EmitterName getEmitterName()
-{
-    return emitterName; 
-}
-
-/** Setter for {@link EmitterSystem#emitterFunction}*/
-public EmitterSystem setEmitterFunction(EmitterSystemFunction pEmitterFunction)
-{
-    emitterFunction = pEmitterFunction;
-    return this;
-}
-
-/** Getter for {@link EmitterSystem#emitterFunction}*/
-public EmitterSystemFunction getEmitterFunction()
-{
-    return emitterFunction; 
-}
-
-/** Setter for {@link EmitterSystem#emitterIDNumber}*/
-public EmitterSystem setEmitterIDNumber(byte pEmitterIDNumber)
-{
-    emitterIDNumber = pEmitterIDNumber;
-    return this;
-}
-
-/** Getter for {@link EmitterSystem#emitterIDNumber}*/
-public byte getEmitterIDNumber()
-{
-    return emitterIDNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       emitterName.marshal(dos);
-       emitterFunction.marshal(dos);
-       dos.writeByte(emitterIDNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        emitterName = EmitterName.unmarshalEnum(dis);
-        uPosition += emitterName.getMarshalledSize();
-        emitterFunction = EmitterSystemFunction.unmarshalEnum(dis);
-        uPosition += emitterFunction.getMarshalledSize();
-        emitterIDNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   emitterName.marshal(buff);
-   emitterFunction.marshal(buff);
-   buff.put( (byte)emitterIDNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    emitterName = EmitterName.unmarshalEnum(buff);
-    emitterFunction = EmitterSystemFunction.unmarshalEnum(buff);
-    emitterIDNumber = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EmitterSystem rhs = (EmitterSystem)obj;
-
-     if( ! (emitterName == rhs.emitterName)) ivarsEqual = false;
-     if( ! (emitterFunction == rhs.emitterFunction)) ivarsEqual = false;
-     if( ! (emitterIDNumber == rhs.emitterIDNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" emitterName: ").append(emitterName).append("\n");
-    sb.append(" emitterFunction: ").append(emitterFunction).append("\n");
-    sb.append(" emitterIDNumber: ").append(emitterIDNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuel.java b/src-generated/edu/nps/moves/dis7/EngineFuel.java
deleted file mode 100644
index 6fe99b1f49d43be17b9f327d0ab082878b39e4c2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EngineFuel.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about an entity's engine fuel. Section 6.2.24.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EngineFuel extends Object implements Serializable
-{
-   /** Fuel quantity, units specified by next field */
-   protected int  fuelQuantity;
-
-   /** Units in which the fuel is measured uid 328 */
-   protected FuelMeasurementUnits fuelMeasurementUnits = FuelMeasurementUnits.values()[0];
-
-   /** Type of fuel uid 413 */
-   protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
-   /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
-   protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
-   /** padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public EngineFuel()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // fuelQuantity
-   marshalSize += fuelMeasurementUnits.getMarshalledSize();
-   marshalSize += fuelType.getMarshalledSize();
-   marshalSize += fuelLocation.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EngineFuel#fuelQuantity}*/
-public EngineFuel setFuelQuantity(int pFuelQuantity)
-{
-    fuelQuantity = pFuelQuantity;
-    return this;
-}
-
-/** Getter for {@link EngineFuel#fuelQuantity}*/
-public int getFuelQuantity()
-{
-    return fuelQuantity; 
-}
-
-/** Setter for {@link EngineFuel#fuelMeasurementUnits}*/
-public EngineFuel setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
-{
-    fuelMeasurementUnits = pFuelMeasurementUnits;
-    return this;
-}
-
-/** Getter for {@link EngineFuel#fuelMeasurementUnits}*/
-public FuelMeasurementUnits getFuelMeasurementUnits()
-{
-    return fuelMeasurementUnits; 
-}
-
-/** Setter for {@link EngineFuel#fuelType}*/
-public EngineFuel setFuelType(SupplyFuelType pFuelType)
-{
-    fuelType = pFuelType;
-    return this;
-}
-
-/** Getter for {@link EngineFuel#fuelType}*/
-public SupplyFuelType getFuelType()
-{
-    return fuelType; 
-}
-
-/** Setter for {@link EngineFuel#fuelLocation}*/
-public EngineFuel setFuelLocation(FuelLocation pFuelLocation)
-{
-    fuelLocation = pFuelLocation;
-    return this;
-}
-
-/** Getter for {@link EngineFuel#fuelLocation}*/
-public FuelLocation getFuelLocation()
-{
-    return fuelLocation; 
-}
-
-/** Setter for {@link EngineFuel#padding}*/
-public EngineFuel setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link EngineFuel#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(fuelQuantity);
-       fuelMeasurementUnits.marshal(dos);
-       fuelType.marshal(dos);
-       fuelLocation.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        fuelQuantity = dis.readInt();
-        uPosition += 4;
-        fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
-        uPosition += fuelMeasurementUnits.getMarshalledSize();
-        fuelType = SupplyFuelType.unmarshalEnum(dis);
-        uPosition += fuelType.getMarshalledSize();
-        fuelLocation = FuelLocation.unmarshalEnum(dis);
-        uPosition += fuelLocation.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)fuelQuantity);
-   fuelMeasurementUnits.marshal(buff);
-   fuelType.marshal(buff);
-   fuelLocation.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    fuelQuantity = buff.getInt();
-    fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
-    fuelType = SupplyFuelType.unmarshalEnum(buff);
-    fuelLocation = FuelLocation.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EngineFuel rhs = (EngineFuel)obj;
-
-     if( ! (fuelQuantity == rhs.fuelQuantity)) ivarsEqual = false;
-     if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
-     if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
-     if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
-    sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
-    sb.append(" fuelType: ").append(fuelType).append("\n");
-    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
deleted file mode 100644
index 807ed54ad86f8525596723c56c78c1608645d82e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EngineFuelReload extends Object implements Serializable
-{
-   /** standard quantity of fuel loaded */
-   protected int  standardQuantity;
-
-   /** maximum quantity of fuel loaded */
-   protected int  maximumQuantity;
-
-   /** seconds normally required to to reload standard qty */
-   protected int  standardQuantityReloadTime;
-
-   /** seconds normally required to to reload maximum qty */
-   protected int  maximumQuantityReloadTime;
-
-   /** Units of measure uid 328 */
-   protected FuelMeasurementUnits fuelMeasurmentUnits = FuelMeasurementUnits.values()[0];
-
-   /**  uid 413 */
-   protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
-   /** fuel  location as related to the entity uid 329 */
-   protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
-   /** padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public EngineFuelReload()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // standardQuantity
-   marshalSize += 4;  // maximumQuantity
-   marshalSize += 4;  // standardQuantityReloadTime
-   marshalSize += 4;  // maximumQuantityReloadTime
-   marshalSize += fuelMeasurmentUnits.getMarshalledSize();
-   marshalSize += fuelType.getMarshalledSize();
-   marshalSize += fuelLocation.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EngineFuelReload#standardQuantity}*/
-public EngineFuelReload setStandardQuantity(int pStandardQuantity)
-{
-    standardQuantity = pStandardQuantity;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#standardQuantity}*/
-public int getStandardQuantity()
-{
-    return standardQuantity; 
-}
-
-/** Setter for {@link EngineFuelReload#maximumQuantity}*/
-public EngineFuelReload setMaximumQuantity(int pMaximumQuantity)
-{
-    maximumQuantity = pMaximumQuantity;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#maximumQuantity}*/
-public int getMaximumQuantity()
-{
-    return maximumQuantity; 
-}
-
-/** Setter for {@link EngineFuelReload#standardQuantityReloadTime}*/
-public EngineFuelReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
-{
-    standardQuantityReloadTime = pStandardQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
-{
-    return standardQuantityReloadTime; 
-}
-
-/** Setter for {@link EngineFuelReload#maximumQuantityReloadTime}*/
-public EngineFuelReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
-{
-    maximumQuantityReloadTime = pMaximumQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
-{
-    return maximumQuantityReloadTime; 
-}
-
-/** Setter for {@link EngineFuelReload#fuelMeasurmentUnits}*/
-public EngineFuelReload setFuelMeasurmentUnits(FuelMeasurementUnits pFuelMeasurmentUnits)
-{
-    fuelMeasurmentUnits = pFuelMeasurmentUnits;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#fuelMeasurmentUnits}*/
-public FuelMeasurementUnits getFuelMeasurmentUnits()
-{
-    return fuelMeasurmentUnits; 
-}
-
-/** Setter for {@link EngineFuelReload#fuelType}*/
-public EngineFuelReload setFuelType(SupplyFuelType pFuelType)
-{
-    fuelType = pFuelType;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#fuelType}*/
-public SupplyFuelType getFuelType()
-{
-    return fuelType; 
-}
-
-/** Setter for {@link EngineFuelReload#fuelLocation}*/
-public EngineFuelReload setFuelLocation(FuelLocation pFuelLocation)
-{
-    fuelLocation = pFuelLocation;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#fuelLocation}*/
-public FuelLocation getFuelLocation()
-{
-    return fuelLocation; 
-}
-
-/** Setter for {@link EngineFuelReload#padding}*/
-public EngineFuelReload setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link EngineFuelReload#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(standardQuantity);
-       dos.writeInt(maximumQuantity);
-       dos.writeInt(standardQuantityReloadTime);
-       dos.writeInt(maximumQuantityReloadTime);
-       fuelMeasurmentUnits.marshal(dos);
-       fuelType.marshal(dos);
-       fuelLocation.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        standardQuantity = dis.readInt();
-        uPosition += 4;
-        maximumQuantity = dis.readInt();
-        uPosition += 4;
-        standardQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-        maximumQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-        fuelMeasurmentUnits = FuelMeasurementUnits.unmarshalEnum(dis);
-        uPosition += fuelMeasurmentUnits.getMarshalledSize();
-        fuelType = SupplyFuelType.unmarshalEnum(dis);
-        uPosition += fuelType.getMarshalledSize();
-        fuelLocation = FuelLocation.unmarshalEnum(dis);
-        uPosition += fuelLocation.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)standardQuantity);
-   buff.putInt( (int)maximumQuantity);
-   buff.putInt( (int)standardQuantityReloadTime);
-   buff.putInt( (int)maximumQuantityReloadTime);
-   fuelMeasurmentUnits.marshal(buff);
-   fuelType.marshal(buff);
-   fuelLocation.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    standardQuantity = buff.getInt();
-    maximumQuantity = buff.getInt();
-    standardQuantityReloadTime = buff.getInt();
-    maximumQuantityReloadTime = buff.getInt();
-    fuelMeasurmentUnits = FuelMeasurementUnits.unmarshalEnum(buff);
-    fuelType = SupplyFuelType.unmarshalEnum(buff);
-    fuelLocation = FuelLocation.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EngineFuelReload rhs = (EngineFuelReload)obj;
-
-     if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
-     if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
-     if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
-     if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
-     if( ! (fuelMeasurmentUnits == rhs.fuelMeasurmentUnits)) ivarsEqual = false;
-     if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
-     if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
-    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
-    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
-    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
-    sb.append(" fuelMeasurmentUnits: ").append(fuelMeasurmentUnits).append("\n");
-    sb.append(" fuelType: ").append(fuelType).append("\n");
-    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
deleted file mode 100644
index b9d2591ded37e50f25735474bea7c3882f506938..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Association or disassociation of two entities.  Section 6.2.94.4.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityAssociationVP extends Object implements Serializable
-{
-   /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
-   protected VariableParameterRecordType recordType = VariableParameterRecordType.ENTITY_ASSOCIATION;
-
-   /** Indicates if this VP has changed since last issuance uid 320 */
-   protected EntityVPRecordChangeIndicator changeIndicator = EntityVPRecordChangeIndicator.values()[0];
-
-   /** Indicates association status between two entities uid 319 */
-   protected EntityAssociationAssociationType associationStatus = EntityAssociationAssociationType.values()[0];
-
-   /** Type of association; 8 bit enum uid 323 */
-   protected EntityAssociationPhysicalAssociationType associationType = EntityAssociationPhysicalAssociationType.values()[0];
-
-   /** Object ID of entity associated with this entity */
-   protected EntityID  entityID = new EntityID(); 
-
-   /** Station location on one's own entity uid 212 */
-   protected IsPartOfStationName ownStationLocation = IsPartOfStationName.values()[0];
-
-   /** Type of physical connection uid 324 */
-   protected EntityAssociationPhysicalConnectionType physicalConnectionType = EntityAssociationPhysicalConnectionType.values()[0];
-
-   /** Type of member the entity is within the group uid 321 */
-   protected EntityAssociationGroupMemberType groupMemberType = EntityAssociationGroupMemberType.values()[0];
-
-   /** Group if any to which the entity belongs */
-   protected short  groupNumber;
-
-
-/** Constructor */
- public EntityAssociationVP()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += changeIndicator.getMarshalledSize();
-   marshalSize += associationStatus.getMarshalledSize();
-   marshalSize += associationType.getMarshalledSize();
-   marshalSize += entityID.getMarshalledSize();
-   marshalSize += ownStationLocation.getMarshalledSize();
-   marshalSize += physicalConnectionType.getMarshalledSize();
-   marshalSize += groupMemberType.getMarshalledSize();
-   marshalSize += 2;  // groupNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityAssociationVP#recordType}*/
-public EntityAssociationVP setRecordType(VariableParameterRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#recordType}*/
-public VariableParameterRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link EntityAssociationVP#changeIndicator}*/
-public EntityAssociationVP setChangeIndicator(EntityVPRecordChangeIndicator pChangeIndicator)
-{
-    changeIndicator = pChangeIndicator;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#changeIndicator}*/
-public EntityVPRecordChangeIndicator getChangeIndicator()
-{
-    return changeIndicator; 
-}
-
-/** Setter for {@link EntityAssociationVP#associationStatus}*/
-public EntityAssociationVP setAssociationStatus(EntityAssociationAssociationType pAssociationStatus)
-{
-    associationStatus = pAssociationStatus;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#associationStatus}*/
-public EntityAssociationAssociationType getAssociationStatus()
-{
-    return associationStatus; 
-}
-
-/** Setter for {@link EntityAssociationVP#associationType}*/
-public EntityAssociationVP setAssociationType(EntityAssociationPhysicalAssociationType pAssociationType)
-{
-    associationType = pAssociationType;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#associationType}*/
-public EntityAssociationPhysicalAssociationType getAssociationType()
-{
-    return associationType; 
-}
-
-/** Setter for {@link EntityAssociationVP#entityID}*/
-public EntityAssociationVP setEntityID(EntityID pEntityID)
-{
-    entityID = pEntityID;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#entityID}*/
-public EntityID getEntityID()
-{
-    return entityID; 
-}
-
-/** Setter for {@link EntityAssociationVP#ownStationLocation}*/
-public EntityAssociationVP setOwnStationLocation(IsPartOfStationName pOwnStationLocation)
-{
-    ownStationLocation = pOwnStationLocation;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#ownStationLocation}*/
-public IsPartOfStationName getOwnStationLocation()
-{
-    return ownStationLocation; 
-}
-
-/** Setter for {@link EntityAssociationVP#physicalConnectionType}*/
-public EntityAssociationVP setPhysicalConnectionType(EntityAssociationPhysicalConnectionType pPhysicalConnectionType)
-{
-    physicalConnectionType = pPhysicalConnectionType;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#physicalConnectionType}*/
-public EntityAssociationPhysicalConnectionType getPhysicalConnectionType()
-{
-    return physicalConnectionType; 
-}
-
-/** Setter for {@link EntityAssociationVP#groupMemberType}*/
-public EntityAssociationVP setGroupMemberType(EntityAssociationGroupMemberType pGroupMemberType)
-{
-    groupMemberType = pGroupMemberType;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#groupMemberType}*/
-public EntityAssociationGroupMemberType getGroupMemberType()
-{
-    return groupMemberType; 
-}
-
-/** Setter for {@link EntityAssociationVP#groupNumber}*/
-public EntityAssociationVP setGroupNumber(short pGroupNumber)
-{
-    groupNumber = pGroupNumber;
-    return this;
-}
-
-/** Getter for {@link EntityAssociationVP#groupNumber}*/
-public short getGroupNumber()
-{
-    return groupNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       changeIndicator.marshal(dos);
-       associationStatus.marshal(dos);
-       associationType.marshal(dos);
-       entityID.marshal(dos);
-       ownStationLocation.marshal(dos);
-       physicalConnectionType.marshal(dos);
-       groupMemberType.marshal(dos);
-       dos.writeShort(groupNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableParameterRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(dis);
-        uPosition += changeIndicator.getMarshalledSize();
-        associationStatus = EntityAssociationAssociationType.unmarshalEnum(dis);
-        uPosition += associationStatus.getMarshalledSize();
-        associationType = EntityAssociationPhysicalAssociationType.unmarshalEnum(dis);
-        uPosition += associationType.getMarshalledSize();
-        uPosition += entityID.unmarshal(dis);
-        ownStationLocation = IsPartOfStationName.unmarshalEnum(dis);
-        uPosition += ownStationLocation.getMarshalledSize();
-        physicalConnectionType = EntityAssociationPhysicalConnectionType.unmarshalEnum(dis);
-        uPosition += physicalConnectionType.getMarshalledSize();
-        groupMemberType = EntityAssociationGroupMemberType.unmarshalEnum(dis);
-        uPosition += groupMemberType.getMarshalledSize();
-        groupNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   changeIndicator.marshal(buff);
-   associationStatus.marshal(buff);
-   associationType.marshal(buff);
-   entityID.marshal(buff);
-   ownStationLocation.marshal(buff);
-   physicalConnectionType.marshal(buff);
-   groupMemberType.marshal(buff);
-   buff.putShort( (short)groupNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableParameterRecordType.unmarshalEnum(buff);
-    changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(buff);
-    associationStatus = EntityAssociationAssociationType.unmarshalEnum(buff);
-    associationType = EntityAssociationPhysicalAssociationType.unmarshalEnum(buff);
-    entityID.unmarshal(buff);
-    ownStationLocation = IsPartOfStationName.unmarshalEnum(buff);
-    physicalConnectionType = EntityAssociationPhysicalConnectionType.unmarshalEnum(buff);
-    groupMemberType = EntityAssociationGroupMemberType.unmarshalEnum(buff);
-    groupNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityAssociationVP rhs = (EntityAssociationVP)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
-     if( ! (associationStatus == rhs.associationStatus)) ivarsEqual = false;
-     if( ! (associationType == rhs.associationType)) ivarsEqual = false;
-     if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
-     if( ! (ownStationLocation == rhs.ownStationLocation)) ivarsEqual = false;
-     if( ! (physicalConnectionType == rhs.physicalConnectionType)) ivarsEqual = false;
-     if( ! (groupMemberType == rhs.groupMemberType)) ivarsEqual = false;
-     if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
-    sb.append(" associationStatus: ").append(associationStatus).append("\n");
-    sb.append(" associationType: ").append(associationType).append("\n");
-    sb.append(" entityID: ").append(entityID).append("\n");
-    sb.append(" ownStationLocation: ").append(ownStationLocation).append("\n");
-    sb.append(" physicalConnectionType: ").append(physicalConnectionType).append("\n");
-    sb.append(" groupMemberType: ").append(groupMemberType).append("\n");
-    sb.append(" groupNumber: ").append(groupNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityCapabilities.java b/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
deleted file mode 100644
index 99754a365924ce285eb2f7ec43e87631a272982b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-/**
- * EntityCapabilities.java created on May 7, 2019
- * Marker interface to polymorphize Entity Capabilities (uid 55) 
- */
-public interface EntityCapabilities extends Marshaller
-{}
diff --git a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
deleted file mode 100644
index 01dac2024f1e7fb053db3df5c76455803d913fe8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.5 Used to communicate detailed damage information sustained by an entity regardless of the source of the damage.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityDamageStatusPdu extends WarfareFamilyPdu implements Serializable
-{
-   /** Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 */
-   protected EntityID  damagedEntityID = new EntityID(); 
-
-   protected short  padding1 = (short)0;
-
-   protected short  padding2 = (short)0;
-
-   /** field shall specify the number of Damage Description records, Section 7.3.5 */
-   protected short  numberOfDamageDescription = (short)0;
-
-   /** Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5 */
-   protected List< DirectedEnergyDamage > damageDescriptionRecords = new ArrayList< DirectedEnergyDamage >();
- 
-
-/** Constructor */
- public EntityDamageStatusPdu()
- {
-    setPduType( DISPDUType.ENTITY_DAMAGE_STATUS );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += damagedEntityID.getMarshalledSize();
-   marshalSize += 2;  // padding1
-   marshalSize += 2;  // padding2
-   marshalSize += 2;  // numberOfDamageDescription
-   for(int idx=0; idx < damageDescriptionRecords.size(); idx++)
-   {
-        DirectedEnergyDamage listElement = damageDescriptionRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityDamageStatusPdu#damagedEntityID}*/
-public EntityDamageStatusPdu setDamagedEntityID(EntityID pDamagedEntityID)
-{
-    damagedEntityID = pDamagedEntityID;
-    return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#damagedEntityID}*/
-public EntityID getDamagedEntityID()
-{
-    return damagedEntityID; 
-}
-
-/** Setter for {@link EntityDamageStatusPdu#padding1}*/
-public EntityDamageStatusPdu setPadding1(short pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#padding1}*/
-public short getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link EntityDamageStatusPdu#padding2}*/
-public EntityDamageStatusPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link EntityDamageStatusPdu#damageDescriptionRecords}*/
-public EntityDamageStatusPdu setDamageDescriptionRecords(List<DirectedEnergyDamage> pDamageDescriptionRecords)
-{
-    damageDescriptionRecords = pDamageDescriptionRecords;
-    return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#damageDescriptionRecords}*/
-public List<DirectedEnergyDamage> getDamageDescriptionRecords()
-{
-    return damageDescriptionRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       damagedEntityID.marshal(dos);
-       dos.writeShort(padding1);
-       dos.writeShort(padding2);
-       dos.writeShort(damageDescriptionRecords.size());
-
-       for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
-       {
-            DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
-            aDirectedEnergyDamage.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += damagedEntityID.unmarshal(dis);
-        padding1 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfDamageDescription = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfDamageDescription; idx++)
-        {
-            DirectedEnergyDamage anX = new DirectedEnergyDamage();
-            uPosition += anX.unmarshal(dis);
-            damageDescriptionRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   damagedEntityID.marshal(buff);
-   buff.putShort( (short)padding1);
-   buff.putShort( (short)padding2);
-   buff.putShort( (short)damageDescriptionRecords.size());
-
-   for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
-   {
-        DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
-        aDirectedEnergyDamage.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    damagedEntityID.unmarshal(buff);
-    padding1 = (short)(buff.getShort() & 0xFFFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    numberOfDamageDescription = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfDamageDescription; idx++)
-    {
-    DirectedEnergyDamage anX = new DirectedEnergyDamage();
-    anX.unmarshal(buff);
-    damageDescriptionRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityDamageStatusPdu rhs = (EntityDamageStatusPdu)obj;
-
-     if( ! (damagedEntityID.equals( rhs.damagedEntityID) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
-        if( ! ( damageDescriptionRecords.get(idx).equals(rhs.damageDescriptionRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" damagedEntityID: ").append(damagedEntityID).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" damageDescriptionRecords: ").append("\n");
-    damageDescriptionRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityID.java b/src-generated/edu/nps/moves/dis7/EntityID.java
deleted file mode 100644
index 4921605f1e73b1866ce8013d6c2a0e35a1afbe24..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityID.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more laconically named EntityIdentifier
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityID extends Object implements Serializable
-{
-   /** Site ID */
-   protected short  siteID;
-
-   /** application number ID */
-   protected short  applicationID;
-
-   /** Entity number ID */
-   protected short  entityID;
-
-
-/** Constructor */
- public EntityID()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // siteID
-   marshalSize += 2;  // applicationID
-   marshalSize += 2;  // entityID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityID#siteID}*/
-public EntityID setSiteID(short pSiteID)
-{
-    siteID = pSiteID;
-    return this;
-}
-
-/** Getter for {@link EntityID#siteID}*/
-public short getSiteID()
-{
-    return siteID; 
-}
-
-/** Setter for {@link EntityID#applicationID}*/
-public EntityID setApplicationID(short pApplicationID)
-{
-    applicationID = pApplicationID;
-    return this;
-}
-
-/** Getter for {@link EntityID#applicationID}*/
-public short getApplicationID()
-{
-    return applicationID; 
-}
-
-/** Setter for {@link EntityID#entityID}*/
-public EntityID setEntityID(short pEntityID)
-{
-    entityID = pEntityID;
-    return this;
-}
-
-/** Getter for {@link EntityID#entityID}*/
-public short getEntityID()
-{
-    return entityID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(siteID);
-       dos.writeShort(applicationID);
-       dos.writeShort(entityID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        siteID = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        applicationID = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        entityID = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)siteID);
-   buff.putShort( (short)applicationID);
-   buff.putShort( (short)entityID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    siteID = (short)(buff.getShort() & 0xFFFF);
-    applicationID = (short)(buff.getShort() & 0xFFFF);
-    entityID = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityID rhs = (EntityID)obj;
-
-     if( ! (siteID == rhs.siteID)) ivarsEqual = false;
-     if( ! (applicationID == rhs.applicationID)) ivarsEqual = false;
-     if( ! (entityID == rhs.entityID)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" siteID: ").append(siteID).append("\n");
-    sb.append(" applicationID: ").append(applicationID).append("\n");
-    sb.append(" entityID: ").append(entityID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
deleted file mode 100644
index e98f06203038819f174680de55e0af8decd5b5f2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityIdentifier extends Object implements Serializable
-{
-   /** Site and application IDs */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /** Entity number */
-   protected short  entityNumber;
-
-
-/** Constructor */
- public EntityIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // entityNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityIdentifier#simulationAddress}*/
-public EntityIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link EntityIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link EntityIdentifier#entityNumber}*/
-public EntityIdentifier setEntityNumber(short pEntityNumber)
-{
-    entityNumber = pEntityNumber;
-    return this;
-}
-
-/** Getter for {@link EntityIdentifier#entityNumber}*/
-public short getEntityNumber()
-{
-    return entityNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(entityNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        entityNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)entityNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    entityNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityIdentifier rhs = (EntityIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" entityNumber: ").append(entityNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
deleted file mode 100644
index 512fc853a5dd48d8d247d8106010321fd3ebe5c2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class EntityInformationFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public EntityInformationFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.ENTITY_INFORMATION_INTERACTION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityInformationFamilyPdu rhs = (EntityInformationFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
deleted file mode 100644
index a8f0e3aa4cdff79dfd2d70db1e5d9952b9d593bf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  Managment of grouping of PDUs, and more. Section 7.8
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class EntityManagementFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public EntityManagementFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.ENTITY_MANAGEMENT );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityManagementFamilyPdu rhs = (EntityManagementFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityMarking.java b/src-generated/edu/nps/moves/dis7/EntityMarking.java
deleted file mode 100644
index f3481b9f699ecfb97a98f9d9c7b80dbbdfc7d894..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityMarking.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityMarking extends Object implements Serializable
-{
-   /** The character set uid 45 */
-   protected EntityMarkingCharacterSet characterSet = EntityMarkingCharacterSet.values()[0];
-
-   /** The characters */
-   protected byte[]  characters = new byte[11]; 
-
-
-/** Constructor */
- public EntityMarking()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += characterSet.getMarshalledSize();
-   marshalSize += characters.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityMarking#characterSet}*/
-public EntityMarking setCharacterSet(EntityMarkingCharacterSet pCharacterSet)
-{
-    characterSet = pCharacterSet;
-    return this;
-}
-
-/** Getter for {@link EntityMarking#characterSet}*/
-public EntityMarkingCharacterSet getCharacterSet()
-{
-    return characterSet; 
-}
-
-/** Setter for {@link EntityMarking#characters}*/
-public EntityMarking setCharacters(byte[] pCharacters)
-{
-    characters = Arrays.copyOf(pCharacters, characters.length);
-    return this;
-}
-
-/** Getter for {@link EntityMarking#characters}*/
-public byte[] getCharacters()
-{
-    return characters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       characterSet.marshal(dos);
-
-       for(int idx = 0; idx < characters.length; idx++)
-           dos.writeByte(characters[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        characterSet = EntityMarkingCharacterSet.unmarshalEnum(dis);
-        uPosition += characterSet.getMarshalledSize();
-        for(int idx = 0; idx < characters.length; idx++)
-            characters[idx] = dis.readByte();
-        uPosition += (characters.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   characterSet.marshal(buff);
-
-   for(int idx = 0; idx < characters.length; idx++)
-       buff.put((byte)characters[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    characterSet = EntityMarkingCharacterSet.unmarshalEnum(buff);
-    for(int idx = 0; idx < characters.length; idx++)
-        characters[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityMarking rhs = (EntityMarking)obj;
-
-     if( ! (characterSet == rhs.characterSet)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 11; idx++)
-     {
-          if(!(characters[idx] == rhs.characters[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" characterSet: ").append(characterSet).append("\n");
-    sb.append(" characters: ").append("\n");
-    sb.append(Arrays.toString(characters)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
deleted file mode 100644
index 55f7f6415254aacae790aeb994502c5657ee3821..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityStatePdu extends EntityInformationFamilyPdu implements Serializable
-{
-   /** Unique ID for an entity that is tied to this state information */
-   protected EntityID  entityID = new EntityID(); 
-
-   /** What force this entity is affiliated with, eg red, blue, neutral, etc uid 6 */
-   protected ForceID forceId = ForceID.values()[0];
-
-   /** How many variable parameters are in the variable length list. In earlier versions of DIS these were known as articulation parameters */
-   protected byte  numberOfVariableParameters;
-
-   /** Describes the type of entity in the world */
-   protected EntityType  entityType = new EntityType(); 
-
-   protected EntityType  alternativeEntityType = new EntityType(); 
-
-   /** Describes the speed of the entity in the world */
-   protected Vector3Float  entityLinearVelocity = new Vector3Float(); 
-
-   /** describes the location of the entity in the world */
-   protected Vector3Double  entityLocation = new Vector3Double(); 
-
-   /** describes the orientation of the entity, in euler angles */
-   protected EulerAngles  entityOrientation = new EulerAngles(); 
-
-   /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */
-   protected int  entityAppearance;
-
-   /** parameters used for dead reckoning */
-   protected DeadReckoningParameters  deadReckoningParameters = new DeadReckoningParameters(); 
-
-   /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */
-   protected EntityMarking  marking = new EntityMarking(); 
-
-   /** a series of bit flags uid 55 */
-   protected EntityCapabilities capabilities = new LandPlatformCapabilities();
-
-   /** variable length list of variable parameters. In earlier DIS versions this was articulation parameters. */
-   protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
- 
-
-/** Constructor */
- public EntityStatePdu()
- {
-    setPduType( DISPDUType.ENTITY_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += entityID.getMarshalledSize();
-   marshalSize += forceId.getMarshalledSize();
-   marshalSize += 1;  // numberOfVariableParameters
-   marshalSize += entityType.getMarshalledSize();
-   marshalSize += alternativeEntityType.getMarshalledSize();
-   marshalSize += entityLinearVelocity.getMarshalledSize();
-   marshalSize += entityLocation.getMarshalledSize();
-   marshalSize += entityOrientation.getMarshalledSize();
-   marshalSize += 4;  // entityAppearance
-   marshalSize += deadReckoningParameters.getMarshalledSize();
-   marshalSize += marking.getMarshalledSize();
-   marshalSize += capabilities.getMarshalledSize();
-   for(int idx=0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter listElement = variableParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityStatePdu#entityID}*/
-public EntityStatePdu setEntityID(EntityID pEntityID)
-{
-    entityID = pEntityID;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityID}*/
-public EntityID getEntityID()
-{
-    return entityID; 
-}
-
-/** Setter for {@link EntityStatePdu#forceId}*/
-public EntityStatePdu setForceId(ForceID pForceId)
-{
-    forceId = pForceId;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#forceId}*/
-public ForceID getForceId()
-{
-    return forceId; 
-}
-
-/** Setter for {@link EntityStatePdu#entityType}*/
-public EntityStatePdu setEntityType(EntityType pEntityType)
-{
-    entityType = pEntityType;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityType}*/
-public EntityType getEntityType()
-{
-    return entityType; 
-}
-
-/** Setter for {@link EntityStatePdu#alternativeEntityType}*/
-public EntityStatePdu setAlternativeEntityType(EntityType pAlternativeEntityType)
-{
-    alternativeEntityType = pAlternativeEntityType;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#alternativeEntityType}*/
-public EntityType getAlternativeEntityType()
-{
-    return alternativeEntityType; 
-}
-
-/** Setter for {@link EntityStatePdu#entityLinearVelocity}*/
-public EntityStatePdu setEntityLinearVelocity(Vector3Float pEntityLinearVelocity)
-{
-    entityLinearVelocity = pEntityLinearVelocity;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityLinearVelocity}*/
-public Vector3Float getEntityLinearVelocity()
-{
-    return entityLinearVelocity; 
-}
-
-/** Setter for {@link EntityStatePdu#entityLocation}*/
-public EntityStatePdu setEntityLocation(Vector3Double pEntityLocation)
-{
-    entityLocation = pEntityLocation;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityLocation}*/
-public Vector3Double getEntityLocation()
-{
-    return entityLocation; 
-}
-
-/** Setter for {@link EntityStatePdu#entityOrientation}*/
-public EntityStatePdu setEntityOrientation(EulerAngles pEntityOrientation)
-{
-    entityOrientation = pEntityOrientation;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityOrientation}*/
-public EulerAngles getEntityOrientation()
-{
-    return entityOrientation; 
-}
-
-/** Setter for {@link EntityStatePdu#entityAppearance}*/
-public EntityStatePdu setEntityAppearance(int pEntityAppearance)
-{
-    entityAppearance = pEntityAppearance;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityAppearance}*/
-public int getEntityAppearance()
-{
-    return entityAppearance; 
-}
-
-/** Setter for {@link EntityStatePdu#deadReckoningParameters}*/
-public EntityStatePdu setDeadReckoningParameters(DeadReckoningParameters pDeadReckoningParameters)
-{
-    deadReckoningParameters = pDeadReckoningParameters;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#deadReckoningParameters}*/
-public DeadReckoningParameters getDeadReckoningParameters()
-{
-    return deadReckoningParameters; 
-}
-
-/** Setter for {@link EntityStatePdu#marking}*/
-public EntityStatePdu setMarking(EntityMarking pMarking)
-{
-    marking = pMarking;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#marking}*/
-public EntityMarking getMarking()
-{
-    return marking; 
-}
-
-/** Setter for {@link EntityStatePdu#capabilities}*/
-public EntityStatePdu setCapabilities(EntityCapabilities pCapabilities)
-{
-    capabilities = pCapabilities;
-    return this;
-}
-
-/** Setter for {@link EntityStatePdu#capabilities}*/
-public EntityCapabilities getCapabilities()
-{
-    return capabilities; 
-}
-
-/** Setter for {@link EntityStatePdu#variableParameters}*/
-public EntityStatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
-{
-    variableParameters = pVariableParameters;
-    return this;
-}
-
-/** Getter for {@link EntityStatePdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
-{
-    return variableParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       entityID.marshal(dos);
-       forceId.marshal(dos);
-       dos.writeByte(variableParameters.size());
-       entityType.marshal(dos);
-       alternativeEntityType.marshal(dos);
-       entityLinearVelocity.marshal(dos);
-       entityLocation.marshal(dos);
-       entityOrientation.marshal(dos);
-       dos.writeInt(entityAppearance);
-       deadReckoningParameters.marshal(dos);
-       marking.marshal(dos);
-       capabilities.marshal(dos);
-
-       for(int idx = 0; idx < variableParameters.size(); idx++)
-       {
-            VariableParameter aVariableParameter = variableParameters.get(idx);
-            aVariableParameter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += entityID.unmarshal(dis);
-        forceId = ForceID.unmarshalEnum(dis);
-        uPosition += forceId.getMarshalledSize();
-        numberOfVariableParameters = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += entityType.unmarshal(dis);
-        uPosition += alternativeEntityType.unmarshal(dis);
-        uPosition += entityLinearVelocity.unmarshal(dis);
-        uPosition += entityLocation.unmarshal(dis);
-        uPosition += entityOrientation.unmarshal(dis);
-        entityAppearance = dis.readInt();
-        uPosition += 4;
-        uPosition += deadReckoningParameters.unmarshal(dis);
-        uPosition += marking.unmarshal(dis);
-        uPosition += capabilities.unmarshal(dis);
-        for(int idx = 0; idx < numberOfVariableParameters; idx++)
-        {
-            VariableParameter anX = new VariableParameter();
-            uPosition += anX.unmarshal(dis);
-            variableParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   entityID.marshal(buff);
-   forceId.marshal(buff);
-   buff.put( (byte)variableParameters.size());
-   entityType.marshal(buff);
-   alternativeEntityType.marshal(buff);
-   entityLinearVelocity.marshal(buff);
-   entityLocation.marshal(buff);
-   entityOrientation.marshal(buff);
-   buff.putInt( (int)entityAppearance);
-   deadReckoningParameters.marshal(buff);
-   marking.marshal(buff);
-   capabilities.marshal(buff);
-
-   for(int idx = 0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter aVariableParameter = variableParameters.get(idx);
-        aVariableParameter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    entityID.unmarshal(buff);
-    forceId = ForceID.unmarshalEnum(buff);
-    numberOfVariableParameters = (byte)(buff.get() & 0xFF);
-    entityType.unmarshal(buff);
-    alternativeEntityType.unmarshal(buff);
-    entityLinearVelocity.unmarshal(buff);
-    entityLocation.unmarshal(buff);
-    entityOrientation.unmarshal(buff);
-    entityAppearance = buff.getInt();
-    deadReckoningParameters.unmarshal(buff);
-    marking.unmarshal(buff);
-    capabilities.unmarshal(buff);
-    for(int idx = 0; idx < numberOfVariableParameters; idx++)
-    {
-    VariableParameter anX = new VariableParameter();
-    anX.unmarshal(buff);
-    variableParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityStatePdu rhs = (EntityStatePdu)obj;
-
-     if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
-     if( ! (forceId == rhs.forceId)) ivarsEqual = false;
-     if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
-     if( ! (alternativeEntityType.equals( rhs.alternativeEntityType) )) ivarsEqual = false;
-     if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
-     if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
-     if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
-     if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
-     if( ! (deadReckoningParameters.equals( rhs.deadReckoningParameters) )) ivarsEqual = false;
-     if( ! (marking.equals( rhs.marking) )) ivarsEqual = false;
-     if( ! (capabilities.equals( rhs.capabilities) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < variableParameters.size(); idx++)
-        if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityID: ").append(entityID).append("\n");
-    sb.append(" forceId: ").append(forceId).append("\n");
-    sb.append(" entityType: ").append(entityType).append("\n");
-    sb.append(" alternativeEntityType: ").append(alternativeEntityType).append("\n");
-    sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
-    sb.append(" entityLocation: ").append(entityLocation).append("\n");
-    sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
-    sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
-    sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
-    sb.append(" marking: ").append(marking).append("\n");
-    sb.append(" capabilities: ").append(capabilities).append("\n");
-    sb.append(" variableParameters: ").append("\n");
-    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
deleted file mode 100644
index d942e06db6763bcae59c7341707a394d143739a2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.5. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. 5.3.5.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityStateUpdatePdu extends EntityInformationFamilyPdu implements Serializable
-{
-   /** This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */
-   protected EntityID  entityID = new EntityID(); 
-
-   /** Padding */
-   protected byte  padding1;
-
-   /** This field shall specify the number of variable parameters present. This field shall be represented by an 8-bit unsigned integer (see Annex I). */
-   protected byte  numberOfVariableParameters;
-
-   /** This field shall specify an entity's linear velocity. The coordinate system for an entity's linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]). */
-   protected Vector3Float  entityLinearVelocity = new Vector3Float(); 
-
-   /** This field shall specify an entity's physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97). */
-   protected Vector3Double  entityLocation = new Vector3Double(); 
-
-   /** This field shall specify an entity's orientation and shall be represented by an Euler Angles record (see 6.2.33). */
-   protected EulerAngles  entityOrientation = new EulerAngles(); 
-
-   /** This field shall specify the dynamic changes to the entity's appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26). */
-   protected int  entityAppearance;
-
-   /** This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I). */
-   protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
- 
-
-/** Constructor */
- public EntityStateUpdatePdu()
- {
-    setPduType( DISPDUType.ENTITY_STATE_UPDATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += entityID.getMarshalledSize();
-   marshalSize += 1;  // padding1
-   marshalSize += 1;  // numberOfVariableParameters
-   marshalSize += entityLinearVelocity.getMarshalledSize();
-   marshalSize += entityLocation.getMarshalledSize();
-   marshalSize += entityOrientation.getMarshalledSize();
-   marshalSize += 4;  // entityAppearance
-   for(int idx=0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter listElement = variableParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityStateUpdatePdu#entityID}*/
-public EntityStateUpdatePdu setEntityID(EntityID pEntityID)
-{
-    entityID = pEntityID;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityID}*/
-public EntityID getEntityID()
-{
-    return entityID; 
-}
-
-/** Setter for {@link EntityStateUpdatePdu#padding1}*/
-public EntityStateUpdatePdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityLinearVelocity}*/
-public EntityStateUpdatePdu setEntityLinearVelocity(Vector3Float pEntityLinearVelocity)
-{
-    entityLinearVelocity = pEntityLinearVelocity;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityLinearVelocity}*/
-public Vector3Float getEntityLinearVelocity()
-{
-    return entityLinearVelocity; 
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityLocation}*/
-public EntityStateUpdatePdu setEntityLocation(Vector3Double pEntityLocation)
-{
-    entityLocation = pEntityLocation;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityLocation}*/
-public Vector3Double getEntityLocation()
-{
-    return entityLocation; 
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityOrientation}*/
-public EntityStateUpdatePdu setEntityOrientation(EulerAngles pEntityOrientation)
-{
-    entityOrientation = pEntityOrientation;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityOrientation}*/
-public EulerAngles getEntityOrientation()
-{
-    return entityOrientation; 
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityAppearance}*/
-public EntityStateUpdatePdu setEntityAppearance(int pEntityAppearance)
-{
-    entityAppearance = pEntityAppearance;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityAppearance}*/
-public int getEntityAppearance()
-{
-    return entityAppearance; 
-}
-
-/** Setter for {@link EntityStateUpdatePdu#variableParameters}*/
-public EntityStateUpdatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
-{
-    variableParameters = pVariableParameters;
-    return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
-{
-    return variableParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       entityID.marshal(dos);
-       dos.writeByte(padding1);
-       dos.writeByte(variableParameters.size());
-       entityLinearVelocity.marshal(dos);
-       entityLocation.marshal(dos);
-       entityOrientation.marshal(dos);
-       dos.writeInt(entityAppearance);
-
-       for(int idx = 0; idx < variableParameters.size(); idx++)
-       {
-            VariableParameter aVariableParameter = variableParameters.get(idx);
-            aVariableParameter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += entityID.unmarshal(dis);
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfVariableParameters = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += entityLinearVelocity.unmarshal(dis);
-        uPosition += entityLocation.unmarshal(dis);
-        uPosition += entityOrientation.unmarshal(dis);
-        entityAppearance = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfVariableParameters; idx++)
-        {
-            VariableParameter anX = new VariableParameter();
-            uPosition += anX.unmarshal(dis);
-            variableParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   entityID.marshal(buff);
-   buff.put( (byte)padding1);
-   buff.put( (byte)variableParameters.size());
-   entityLinearVelocity.marshal(buff);
-   entityLocation.marshal(buff);
-   entityOrientation.marshal(buff);
-   buff.putInt( (int)entityAppearance);
-
-   for(int idx = 0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter aVariableParameter = variableParameters.get(idx);
-        aVariableParameter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    entityID.unmarshal(buff);
-    padding1 = (byte)(buff.get() & 0xFF);
-    numberOfVariableParameters = (byte)(buff.get() & 0xFF);
-    entityLinearVelocity.unmarshal(buff);
-    entityLocation.unmarshal(buff);
-    entityOrientation.unmarshal(buff);
-    entityAppearance = buff.getInt();
-    for(int idx = 0; idx < numberOfVariableParameters; idx++)
-    {
-    VariableParameter anX = new VariableParameter();
-    anX.unmarshal(buff);
-    variableParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityStateUpdatePdu rhs = (EntityStateUpdatePdu)obj;
-
-     if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
-     if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
-     if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
-     if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
-
-     for(int idx = 0; idx < variableParameters.size(); idx++)
-        if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityID: ").append(entityID).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
-    sb.append(" entityLocation: ").append(entityLocation).append("\n");
-    sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
-    sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
-    sb.append(" variableParameters: ").append("\n");
-    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityType.java b/src-generated/edu/nps/moves/dis7/EntityType.java
deleted file mode 100644
index b1a2f63c439536bf8d897f56d4c90c48c3f04674..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityType.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type of Entity
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityType extends Object implements Serializable
-{
-   /** Kind of entity uid 7 */
-   protected EntityKind entityKind = EntityKind.values()[0];
-
-   /** Domain of entity (air, surface, subsurface, space, etc) */
-   protected Domain  domain =  Domain.inst(PlatformDomain.OTHER); 
-
-   /** country to which the design of the entity is attributed uid 29 */
-   protected Country country = Country.values()[0];
-
-   /** category of entity */
-   protected byte  category;
-
-   /** subcategory based on category */
-   protected byte  subCategory;
-
-   /** specific info based on subcategory */
-   protected byte  specific;
-
-   protected byte  extra;
-
-
-/** Constructor */
- public EntityType()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityKind.getMarshalledSize();
-   marshalSize += domain.getMarshalledSize();
-   marshalSize += country.getMarshalledSize();
-   marshalSize += 1;  // category
-   marshalSize += 1;  // subCategory
-   marshalSize += 1;  // specific
-   marshalSize += 1;  // extra
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityType#entityKind}*/
-public EntityType setEntityKind(EntityKind pEntityKind)
-{
-    entityKind = pEntityKind;
-    return this;
-}
-
-/** Getter for {@link EntityType#entityKind}*/
-public EntityKind getEntityKind()
-{
-    return entityKind; 
-}
-
-/** Setter for {@link EntityType#domain}*/
-public EntityType setDomain(Domain pDomain)
-{
-    domain = pDomain;
-    return this;
-}
-
-/** Getter for {@link EntityType#domain}*/
-public Domain getDomain()
-{
-    return domain; 
-}
-
-/** Setter for {@link EntityType#country}*/
-public EntityType setCountry(Country pCountry)
-{
-    country = pCountry;
-    return this;
-}
-
-/** Getter for {@link EntityType#country}*/
-public Country getCountry()
-{
-    return country; 
-}
-
-/** Setter for {@link EntityType#category}*/
-public EntityType setCategory(byte pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link EntityType#category}*/
-public byte getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link EntityType#subCategory}*/
-public EntityType setSubCategory(byte pSubCategory)
-{
-    subCategory = pSubCategory;
-    return this;
-}
-
-/** Getter for {@link EntityType#subCategory}*/
-public byte getSubCategory()
-{
-    return subCategory; 
-}
-
-/** Setter for {@link EntityType#specific}*/
-public EntityType setSpecific(byte pSpecific)
-{
-    specific = pSpecific;
-    return this;
-}
-
-/** Getter for {@link EntityType#specific}*/
-public byte getSpecific()
-{
-    return specific; 
-}
-
-/** Setter for {@link EntityType#extra}*/
-public EntityType setExtra(byte pExtra)
-{
-    extra = pExtra;
-    return this;
-}
-
-/** Getter for {@link EntityType#extra}*/
-public byte getExtra()
-{
-    return extra; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityKind.marshal(dos);
-       domain.marshal(dos);
-       country.marshal(dos);
-       dos.writeByte(category);
-       dos.writeByte(subCategory);
-       dos.writeByte(specific);
-       dos.writeByte(extra);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        entityKind = EntityKind.unmarshalEnum(dis);
-        uPosition += entityKind.getMarshalledSize();
-        uPosition += domain.unmarshal(dis);
-        country = Country.unmarshalEnum(dis);
-        uPosition += country.getMarshalledSize();
-        category = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        subCategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        specific = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        extra = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityKind.marshal(buff);
-   domain.marshal(buff);
-   country.marshal(buff);
-   buff.put( (byte)category);
-   buff.put( (byte)subCategory);
-   buff.put( (byte)specific);
-   buff.put( (byte)extra);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityKind = EntityKind.unmarshalEnum(buff);
-    domain.unmarshal(buff);
-    country = Country.unmarshalEnum(buff);
-    category = (byte)(buff.get() & 0xFF);
-    subCategory = (byte)(buff.get() & 0xFF);
-    specific = (byte)(buff.get() & 0xFF);
-    extra = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityType rhs = (EntityType)obj;
-
-     if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
-     if( ! (domain.equals( rhs.domain) )) ivarsEqual = false;
-     if( ! (country == rhs.country)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
-     if( ! (specific == rhs.specific)) ivarsEqual = false;
-     if( ! (extra == rhs.extra)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityKind: ").append(entityKind).append("\n");
-    sb.append(" domain: ").append(domain).append("\n");
-    sb.append(" country: ").append(country).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subCategory: ").append(subCategory).append("\n");
-    sb.append(" specific: ").append(specific).append("\n");
-    sb.append(" extra: ").append(extra).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
deleted file mode 100644
index 44d0c77d0dbc0d032a1dbc8ff23ef5e9b2251a87..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type of Entity
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityTypeRaw extends Object implements Serializable
-{
-   /** Kind of entity uid 7 */
-   protected EntityKind entityKind = EntityKind.values()[0];
-
-   /** Domain of entity (air, surface, subsurface, space, etc) */
-   protected byte  domain;
-
-   /** country to which the design of the entity is attributed */
-   protected short  country;
-
-   /** category of entity */
-   protected byte  category;
-
-   /** subcategory of entity */
-   protected byte  subCategory;
-
-   /** specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL. */
-   protected byte  specific;
-
-   protected byte  extra;
-
-
-/** Constructor */
- public EntityTypeRaw()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityKind.getMarshalledSize();
-   marshalSize += 1;  // domain
-   marshalSize += 2;  // country
-   marshalSize += 1;  // category
-   marshalSize += 1;  // subCategory
-   marshalSize += 1;  // specific
-   marshalSize += 1;  // extra
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityTypeRaw#entityKind}*/
-public EntityTypeRaw setEntityKind(EntityKind pEntityKind)
-{
-    entityKind = pEntityKind;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#entityKind}*/
-public EntityKind getEntityKind()
-{
-    return entityKind; 
-}
-
-/** Setter for {@link EntityTypeRaw#domain}*/
-public EntityTypeRaw setDomain(byte pDomain)
-{
-    domain = pDomain;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#domain}*/
-public byte getDomain()
-{
-    return domain; 
-}
-
-/** Setter for {@link EntityTypeRaw#country}*/
-public EntityTypeRaw setCountry(short pCountry)
-{
-    country = pCountry;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#country}*/
-public short getCountry()
-{
-    return country; 
-}
-
-/** Setter for {@link EntityTypeRaw#category}*/
-public EntityTypeRaw setCategory(byte pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#category}*/
-public byte getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link EntityTypeRaw#subCategory}*/
-public EntityTypeRaw setSubCategory(byte pSubCategory)
-{
-    subCategory = pSubCategory;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#subCategory}*/
-public byte getSubCategory()
-{
-    return subCategory; 
-}
-
-/** Setter for {@link EntityTypeRaw#specific}*/
-public EntityTypeRaw setSpecific(byte pSpecific)
-{
-    specific = pSpecific;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#specific}*/
-public byte getSpecific()
-{
-    return specific; 
-}
-
-/** Setter for {@link EntityTypeRaw#extra}*/
-public EntityTypeRaw setExtra(byte pExtra)
-{
-    extra = pExtra;
-    return this;
-}
-
-/** Getter for {@link EntityTypeRaw#extra}*/
-public byte getExtra()
-{
-    return extra; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityKind.marshal(dos);
-       dos.writeByte(domain);
-       dos.writeShort(country);
-       dos.writeByte(category);
-       dos.writeByte(subCategory);
-       dos.writeByte(specific);
-       dos.writeByte(extra);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        entityKind = EntityKind.unmarshalEnum(dis);
-        uPosition += entityKind.getMarshalledSize();
-        domain = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        country = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        category = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        subCategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        specific = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        extra = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityKind.marshal(buff);
-   buff.put( (byte)domain);
-   buff.putShort( (short)country);
-   buff.put( (byte)category);
-   buff.put( (byte)subCategory);
-   buff.put( (byte)specific);
-   buff.put( (byte)extra);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityKind = EntityKind.unmarshalEnum(buff);
-    domain = (byte)(buff.get() & 0xFF);
-    country = (short)(buff.getShort() & 0xFFFF);
-    category = (byte)(buff.get() & 0xFF);
-    subCategory = (byte)(buff.get() & 0xFF);
-    specific = (byte)(buff.get() & 0xFF);
-    extra = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityTypeRaw rhs = (EntityTypeRaw)obj;
-
-     if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
-     if( ! (domain == rhs.domain)) ivarsEqual = false;
-     if( ! (country == rhs.country)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
-     if( ! (specific == rhs.specific)) ivarsEqual = false;
-     if( ! (extra == rhs.extra)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityKind: ").append(entityKind).append("\n");
-    sb.append(" domain: ").append(domain).append("\n");
-    sb.append(" country: ").append(country).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subCategory: ").append(subCategory).append("\n");
-    sb.append(" specific: ").append(specific).append("\n");
-    sb.append(" extra: ").append(extra).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
deleted file mode 100644
index 14d02997ea88c0adc9efa411f9155954ba1f8f09..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Association or disassociation of two entities.  Section 6.2.94.5
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EntityTypeVP extends Object implements Serializable
-{
-   /** the identification of the Variable Parameter record. uid 56 */
-   protected VariableParameterRecordType recordType = VariableParameterRecordType.ENTITY_TYPE;
-
-   /** Indicates if this VP has changed since last issuance uid 320 */
-   protected EntityVPRecordChangeIndicator changeIndicator = EntityVPRecordChangeIndicator.values()[0];
-
-   /**  */
-   protected EntityType  entityType = new EntityType(); 
-
-   /** padding */
-   protected short  padding = (short)0;
-
-   /** padding */
-   protected int  padding1 = (int)0;
-
-
-/** Constructor */
- public EntityTypeVP()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += changeIndicator.getMarshalledSize();
-   marshalSize += entityType.getMarshalledSize();
-   marshalSize += 2;  // padding
-   marshalSize += 4;  // padding1
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EntityTypeVP#recordType}*/
-public EntityTypeVP setRecordType(VariableParameterRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link EntityTypeVP#recordType}*/
-public VariableParameterRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link EntityTypeVP#changeIndicator}*/
-public EntityTypeVP setChangeIndicator(EntityVPRecordChangeIndicator pChangeIndicator)
-{
-    changeIndicator = pChangeIndicator;
-    return this;
-}
-
-/** Getter for {@link EntityTypeVP#changeIndicator}*/
-public EntityVPRecordChangeIndicator getChangeIndicator()
-{
-    return changeIndicator; 
-}
-
-/** Setter for {@link EntityTypeVP#entityType}*/
-public EntityTypeVP setEntityType(EntityType pEntityType)
-{
-    entityType = pEntityType;
-    return this;
-}
-
-/** Getter for {@link EntityTypeVP#entityType}*/
-public EntityType getEntityType()
-{
-    return entityType; 
-}
-
-/** Setter for {@link EntityTypeVP#padding}*/
-public EntityTypeVP setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link EntityTypeVP#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link EntityTypeVP#padding1}*/
-public EntityTypeVP setPadding1(int pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link EntityTypeVP#padding1}*/
-public int getPadding1()
-{
-    return padding1; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       changeIndicator.marshal(dos);
-       entityType.marshal(dos);
-       dos.writeShort(padding);
-       dos.writeInt(padding1);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableParameterRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(dis);
-        uPosition += changeIndicator.getMarshalledSize();
-        uPosition += entityType.unmarshal(dis);
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding1 = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   changeIndicator.marshal(buff);
-   entityType.marshal(buff);
-   buff.putShort( (short)padding);
-   buff.putInt( (int)padding1);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableParameterRecordType.unmarshalEnum(buff);
-    changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(buff);
-    entityType.unmarshal(buff);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    padding1 = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EntityTypeVP rhs = (EntityTypeVP)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
-     if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
-    sb.append(" entityType: ").append(entityType).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java b/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
deleted file mode 100644
index 39cd6c92495f30f1477fb7bb4add91a863a1ba73..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-/**
- * EnumNotFoundException.java created on Apr 15, 2019
- */
-public class EnumNotFoundException extends Exception
-{
-  public EnumNotFoundException (String s)
-  {
-      super(s);
-  }
-}
diff --git a/src-generated/edu/nps/moves/dis7/Environment.java b/src-generated/edu/nps/moves/dis7/Environment.java
deleted file mode 100644
index 940d26c7150198423b508fd812af3ac55568482b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Environment.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID.  6.2.31, not fully defined. 'The current definitions can be found in DIS PCR 240'
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Environment extends Object implements Serializable
-{
-   /** Record type uid 250 */
-   protected EnvironmentalProcessRecordType environmentType = EnvironmentalProcessRecordType.values()[0];
-
-   /** length, in bits */
-   protected short  length;
-
-   /** Identify the sequentially numbered record index */
-   protected byte  index;
-
-   /** padding */
-   protected byte  padding1;
-
-   /** Geometry or state record */
-   protected byte[]  geometry = new byte[0]; 
-
-   private byte[] padding2 = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public Environment()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += environmentType.getMarshalledSize();
-   marshalSize += 2;  // length
-   marshalSize += 1;  // index
-   marshalSize += 1;  // padding1
-   marshalSize += geometry.length * 1;
-   marshalSize += padding2.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Environment#environmentType}*/
-public Environment setEnvironmentType(EnvironmentalProcessRecordType pEnvironmentType)
-{
-    environmentType = pEnvironmentType;
-    return this;
-}
-
-/** Getter for {@link Environment#environmentType}*/
-public EnvironmentalProcessRecordType getEnvironmentType()
-{
-    return environmentType; 
-}
-
-/** Setter for {@link Environment#length}*/
-public Environment setLength(short pLength)
-{
-    length = pLength;
-    return this;
-}
-
-/** Getter for {@link Environment#length}*/
-public short getLength()
-{
-    return length; 
-}
-
-/** Setter for {@link Environment#index}*/
-public Environment setIndex(byte pIndex)
-{
-    index = pIndex;
-    return this;
-}
-
-/** Getter for {@link Environment#index}*/
-public byte getIndex()
-{
-    return index; 
-}
-
-/** Setter for {@link Environment#padding1}*/
-public Environment setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link Environment#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link Environment#geometry}*/
-public Environment setGeometry(byte[] pGeometry)
-{
-    geometry = pGeometry;
-    return this;
-}
-
-/** Getter for {@link Environment#geometry}*/
-public byte[] getGeometry()
-{
-    return geometry; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       environmentType.marshal(dos);
-       dos.writeShort(length);
-       dos.writeByte(index);
-       dos.writeByte(padding1);
-
-       for(int idx = 0; idx < geometry.length; idx++)
-           dos.writeByte(geometry[idx]);
-
-       padding2 = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        environmentType = EnvironmentalProcessRecordType.unmarshalEnum(dis);
-        uPosition += environmentType.getMarshalledSize();
-        length = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        index = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        for(int idx = 0; idx < geometry.length; idx++)
-            geometry[idx] = dis.readByte();
-        uPosition += (geometry.length * 1);
-        padding2 = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding2.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   environmentType.marshal(buff);
-   buff.putShort( (short)length);
-   buff.put( (byte)index);
-   buff.put( (byte)padding1);
-
-   for(int idx = 0; idx < geometry.length; idx++)
-       buff.put((byte)geometry[idx]);
-
-   padding2 = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    environmentType = EnvironmentalProcessRecordType.unmarshalEnum(buff);
-    length = (short)(buff.getShort() & 0xFFFF);
-    index = (byte)(buff.get() & 0xFF);
-    padding1 = (byte)(buff.get() & 0xFF);
-    for(int idx = 0; idx < geometry.length; idx++)
-        geometry[idx] = buff.get();
-    padding2 = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Environment rhs = (Environment)obj;
-
-     if( ! (environmentType == rhs.environmentType)) ivarsEqual = false;
-     if( ! (length == rhs.length)) ivarsEqual = false;
-     if( ! (index == rhs.index)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(geometry[idx] == rhs.geometry[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" environmentType: ").append(environmentType).append("\n");
-    sb.append(" length: ").append(length).append("\n");
-    sb.append(" index: ").append(index).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" geometry: ").append("\n");
-    sb.append(Arrays.toString(geometry)).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
deleted file mode 100644
index b3582532aad571b1fb4203b08d5b358ad601e864..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.2 Used to communicate information about environmental effects and processes.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EnvironmentalProcessPdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
-   /** Environmental process ID */
-   protected ObjectIdentifier  environementalProcessID = new ObjectIdentifier(); 
-
-   /** Environment type */
-   protected EntityType  environmentType = new EntityType(); 
-
-   /** model type uid 248 */
-   protected EnvironmentalProcessModelType modelType = EnvironmentalProcessModelType.values()[0];
-
-   /** Environment status uid 249 */
-   protected EnvironmentalProcessEnvironmentStatus environmentStatus = new EnvironmentalProcessEnvironmentStatus();
-
-   /** number of environment records  */
-   protected short  numberOfEnvironmentRecords;
-
-   /** PDU sequence number for the environmental process if pdu sequencing required */
-   protected short  sequenceNumber;
-
-   /** environmemt records */
-   protected List< Environment > environmentRecords = new ArrayList< Environment >();
- 
-
-/** Constructor */
- public EnvironmentalProcessPdu()
- {
-    setPduType( DISPDUType.ENVIRONMENTAL_PROCESS );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += environementalProcessID.getMarshalledSize();
-   marshalSize += environmentType.getMarshalledSize();
-   marshalSize += modelType.getMarshalledSize();
-   marshalSize += environmentStatus.getMarshalledSize();
-   marshalSize += 2;  // numberOfEnvironmentRecords
-   marshalSize += 2;  // sequenceNumber
-   for(int idx=0; idx < environmentRecords.size(); idx++)
-   {
-        Environment listElement = environmentRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EnvironmentalProcessPdu#environementalProcessID}*/
-public EnvironmentalProcessPdu setEnvironementalProcessID(ObjectIdentifier pEnvironementalProcessID)
-{
-    environementalProcessID = pEnvironementalProcessID;
-    return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#environementalProcessID}*/
-public ObjectIdentifier getEnvironementalProcessID()
-{
-    return environementalProcessID; 
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentType}*/
-public EnvironmentalProcessPdu setEnvironmentType(EntityType pEnvironmentType)
-{
-    environmentType = pEnvironmentType;
-    return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#environmentType}*/
-public EntityType getEnvironmentType()
-{
-    return environmentType; 
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#modelType}*/
-public EnvironmentalProcessPdu setModelType(EnvironmentalProcessModelType pModelType)
-{
-    modelType = pModelType;
-    return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#modelType}*/
-public EnvironmentalProcessModelType getModelType()
-{
-    return modelType; 
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentStatus}*/
-public EnvironmentalProcessPdu setEnvironmentStatus(EnvironmentalProcessEnvironmentStatus pEnvironmentStatus)
-{
-    environmentStatus = pEnvironmentStatus;
-    return this;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentStatus}*/
-public EnvironmentalProcessEnvironmentStatus getEnvironmentStatus()
-{
-    return environmentStatus; 
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#sequenceNumber}*/
-public EnvironmentalProcessPdu setSequenceNumber(short pSequenceNumber)
-{
-    sequenceNumber = pSequenceNumber;
-    return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#sequenceNumber}*/
-public short getSequenceNumber()
-{
-    return sequenceNumber; 
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentRecords}*/
-public EnvironmentalProcessPdu setEnvironmentRecords(List<Environment> pEnvironmentRecords)
-{
-    environmentRecords = pEnvironmentRecords;
-    return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#environmentRecords}*/
-public List<Environment> getEnvironmentRecords()
-{
-    return environmentRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       environementalProcessID.marshal(dos);
-       environmentType.marshal(dos);
-       modelType.marshal(dos);
-       environmentStatus.marshal(dos);
-       dos.writeShort(environmentRecords.size());
-       dos.writeShort(sequenceNumber);
-
-       for(int idx = 0; idx < environmentRecords.size(); idx++)
-       {
-            Environment aEnvironment = environmentRecords.get(idx);
-            aEnvironment.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += environementalProcessID.unmarshal(dis);
-        uPosition += environmentType.unmarshal(dis);
-        modelType = EnvironmentalProcessModelType.unmarshalEnum(dis);
-        uPosition += modelType.getMarshalledSize();
-        uPosition += environmentStatus.unmarshal(dis);
-        numberOfEnvironmentRecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        sequenceNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfEnvironmentRecords; idx++)
-        {
-            Environment anX = new Environment();
-            uPosition += anX.unmarshal(dis);
-            environmentRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   environementalProcessID.marshal(buff);
-   environmentType.marshal(buff);
-   modelType.marshal(buff);
-   environmentStatus.marshal(buff);
-   buff.putShort( (short)environmentRecords.size());
-   buff.putShort( (short)sequenceNumber);
-
-   for(int idx = 0; idx < environmentRecords.size(); idx++)
-   {
-        Environment aEnvironment = environmentRecords.get(idx);
-        aEnvironment.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    environementalProcessID.unmarshal(buff);
-    environmentType.unmarshal(buff);
-    modelType = EnvironmentalProcessModelType.unmarshalEnum(buff);
-    environmentStatus.unmarshal(buff);
-    numberOfEnvironmentRecords = (short)(buff.getShort() & 0xFFFF);
-    sequenceNumber = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfEnvironmentRecords; idx++)
-    {
-    Environment anX = new Environment();
-    anX.unmarshal(buff);
-    environmentRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EnvironmentalProcessPdu rhs = (EnvironmentalProcessPdu)obj;
-
-     if( ! (environementalProcessID.equals( rhs.environementalProcessID) )) ivarsEqual = false;
-     if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
-     if( ! (modelType == rhs.modelType)) ivarsEqual = false;
-     if( ! (environmentStatus.equals( rhs.environmentStatus) )) ivarsEqual = false;
-     if( ! (sequenceNumber == rhs.sequenceNumber)) ivarsEqual = false;
-
-     for(int idx = 0; idx < environmentRecords.size(); idx++)
-        if( ! ( environmentRecords.get(idx).equals(rhs.environmentRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" environementalProcessID: ").append(environementalProcessID).append("\n");
-    sb.append(" environmentType: ").append(environmentType).append("\n");
-    sb.append(" modelType: ").append(modelType).append("\n");
-    sb.append(" environmentStatus: ").append(environmentStatus).append("\n");
-    sb.append(" sequenceNumber: ").append(sequenceNumber).append("\n");
-    sb.append(" environmentRecords: ").append("\n");
-    environmentRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EulerAngles.java b/src-generated/edu/nps/moves/dis7/EulerAngles.java
deleted file mode 100644
index 9ae2ec36f8413e33dcde22e1f2cd96dccffa1962..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EulerAngles.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EulerAngles extends Object implements Serializable
-{
-   protected float  psi;
-
-   protected float  theta;
-
-   protected float  phi;
-
-
-/** Constructor */
- public EulerAngles()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // psi
-   marshalSize += 4;  // theta
-   marshalSize += 4;  // phi
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EulerAngles#psi}*/
-public EulerAngles setPsi(float pPsi)
-{
-    psi = pPsi;
-    return this;
-}
-
-/** Getter for {@link EulerAngles#psi}*/
-public float getPsi()
-{
-    return psi; 
-}
-
-/** Setter for {@link EulerAngles#theta}*/
-public EulerAngles setTheta(float pTheta)
-{
-    theta = pTheta;
-    return this;
-}
-
-/** Getter for {@link EulerAngles#theta}*/
-public float getTheta()
-{
-    return theta; 
-}
-
-/** Setter for {@link EulerAngles#phi}*/
-public EulerAngles setPhi(float pPhi)
-{
-    phi = pPhi;
-    return this;
-}
-
-/** Getter for {@link EulerAngles#phi}*/
-public float getPhi()
-{
-    return phi; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(psi);
-       dos.writeFloat(theta);
-       dos.writeFloat(phi);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        psi = dis.readFloat();
-        uPosition += 4;
-        theta = dis.readFloat();
-        uPosition += 4;
-        phi = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)psi);
-   buff.putFloat( (float)theta);
-   buff.putFloat( (float)phi);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    psi = buff.getFloat();
-    theta = buff.getFloat();
-    phi = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EulerAngles rhs = (EulerAngles)obj;
-
-     if( ! (psi == rhs.psi)) ivarsEqual = false;
-     if( ! (theta == rhs.theta)) ivarsEqual = false;
-     if( ! (phi == rhs.phi)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" psi: ").append(psi).append("\n");
-    sb.append(" theta: ").append(theta).append("\n");
-    sb.append(" phi: ").append(phi).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifier.java b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
deleted file mode 100644
index b864cf0c3641e57148620f0c1832bafb485fd017..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EventIdentifier.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EventIdentifier extends Object implements Serializable
-{
-   /** Site and application IDs */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   protected short  eventNumber;
-
-
-/** Constructor */
- public EventIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // eventNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EventIdentifier#simulationAddress}*/
-public EventIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link EventIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link EventIdentifier#eventNumber}*/
-public EventIdentifier setEventNumber(short pEventNumber)
-{
-    eventNumber = pEventNumber;
-    return this;
-}
-
-/** Getter for {@link EventIdentifier#eventNumber}*/
-public short getEventNumber()
-{
-    return eventNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(eventNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        eventNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)eventNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    eventNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EventIdentifier rhs = (EventIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" eventNumber: ").append(eventNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
deleted file mode 100644
index b6e7a7fa0e51e872589d953153f6e85eeef04f29..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EventIdentifierLiveEntity extends Object implements Serializable
-{
-   protected byte  siteNumber;
-
-   protected byte  applicationNumber;
-
-   protected short  eventNumber;
-
-
-/** Constructor */
- public EventIdentifierLiveEntity()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // siteNumber
-   marshalSize += 1;  // applicationNumber
-   marshalSize += 2;  // eventNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EventIdentifierLiveEntity#siteNumber}*/
-public EventIdentifierLiveEntity setSiteNumber(byte pSiteNumber)
-{
-    siteNumber = pSiteNumber;
-    return this;
-}
-
-/** Getter for {@link EventIdentifierLiveEntity#siteNumber}*/
-public byte getSiteNumber()
-{
-    return siteNumber; 
-}
-
-/** Setter for {@link EventIdentifierLiveEntity#applicationNumber}*/
-public EventIdentifierLiveEntity setApplicationNumber(byte pApplicationNumber)
-{
-    applicationNumber = pApplicationNumber;
-    return this;
-}
-
-/** Getter for {@link EventIdentifierLiveEntity#applicationNumber}*/
-public byte getApplicationNumber()
-{
-    return applicationNumber; 
-}
-
-/** Setter for {@link EventIdentifierLiveEntity#eventNumber}*/
-public EventIdentifierLiveEntity setEventNumber(short pEventNumber)
-{
-    eventNumber = pEventNumber;
-    return this;
-}
-
-/** Getter for {@link EventIdentifierLiveEntity#eventNumber}*/
-public short getEventNumber()
-{
-    return eventNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(siteNumber);
-       dos.writeByte(applicationNumber);
-       dos.writeShort(eventNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        siteNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        applicationNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        eventNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)siteNumber);
-   buff.put( (byte)applicationNumber);
-   buff.putShort( (short)eventNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    siteNumber = (byte)(buff.get() & 0xFF);
-    applicationNumber = (byte)(buff.get() & 0xFF);
-    eventNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EventIdentifierLiveEntity rhs = (EventIdentifierLiveEntity)obj;
-
-     if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
-     if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
-     if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" siteNumber: ").append(siteNumber).append("\n");
-    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
-    sb.append(" eventNumber: ").append(eventNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportPdu.java b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
deleted file mode 100644
index d7333eece42d8b0d6a0a31577f68eb5c73d2e4b6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EventReportPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.12 Reports occurance of a significant event to the simulation manager. See 5.6.5.12.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EventReportPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** Type of event uid 73 */
-   protected EventReportEventType eventType = EventReportEventType.values()[0];
-
-   /** padding */
-   protected int  padding1 = (int)0;
-
-   /** Number of fixed datum records */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variable length list of fixed datums */
-   protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
- 
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public EventReportPdu()
- {
-    setPduType( DISPDUType.EVENT_REPORT );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += eventType.getMarshalledSize();
-   marshalSize += 4;  // padding1
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EventReportPdu#eventType}*/
-public EventReportPdu setEventType(EventReportEventType pEventType)
-{
-    eventType = pEventType;
-    return this;
-}
-
-/** Getter for {@link EventReportPdu#eventType}*/
-public EventReportEventType getEventType()
-{
-    return eventType; 
-}
-
-/** Setter for {@link EventReportPdu#padding1}*/
-public EventReportPdu setPadding1(int pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link EventReportPdu#padding1}*/
-public int getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link EventReportPdu#fixedDatums}*/
-public EventReportPdu setFixedDatums(List<FixedDatum> pFixedDatums)
-{
-    fixedDatums = pFixedDatums;
-    return this;
-}
-
-/** Getter for {@link EventReportPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
-{
-    return fixedDatums; 
-}
-
-/** Setter for {@link EventReportPdu#variableDatums}*/
-public EventReportPdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link EventReportPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       eventType.marshal(dos);
-       dos.writeInt(padding1);
-       dos.writeInt(fixedDatums.size());
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < fixedDatums.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatums.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        eventType = EventReportEventType.unmarshalEnum(dis);
-        uPosition += eventType.getMarshalledSize();
-        padding1 = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatums.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   eventType.marshal(buff);
-   buff.putInt( (int)padding1);
-   buff.putInt( (int)fixedDatums.size());
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatums.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    eventType = EventReportEventType.unmarshalEnum(buff);
-    padding1 = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatums.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EventReportPdu rhs = (EventReportPdu)obj;
-
-     if( ! (eventType == rhs.eventType)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatums.size(); idx++)
-        if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" eventType: ").append(eventType).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" fixedDatums: ").append("\n");
-    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
deleted file mode 100644
index 4ad64e5fe3d55ac074253d72aae62c61898e8df1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.12 Contains the same information as found in the Event Report PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EventReportRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** Event type uid 73 */
-   protected EventReportEventType eventType = EventReportEventType.values()[0];
-
-   /** padding */
-   protected int  pad1;
-
-   /** Fixed datum record count */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Fixed datum records */
-   protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
- 
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public EventReportRPdu()
- {
-    setPduType( DISPDUType.EVENT_REPORT_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += eventType.getMarshalledSize();
-   marshalSize += 4;  // pad1
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link EventReportRPdu#eventType}*/
-public EventReportRPdu setEventType(EventReportEventType pEventType)
-{
-    eventType = pEventType;
-    return this;
-}
-
-/** Getter for {@link EventReportRPdu#eventType}*/
-public EventReportEventType getEventType()
-{
-    return eventType; 
-}
-
-/** Setter for {@link EventReportRPdu#pad1}*/
-public EventReportRPdu setPad1(int pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link EventReportRPdu#pad1}*/
-public int getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link EventReportRPdu#fixedDatumRecords}*/
-public EventReportRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
-{
-    fixedDatumRecords = pFixedDatumRecords;
-    return this;
-}
-
-/** Getter for {@link EventReportRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
-{
-    return fixedDatumRecords; 
-}
-
-/** Setter for {@link EventReportRPdu#variableDatumRecords}*/
-public EventReportRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link EventReportRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       eventType.marshal(dos);
-       dos.writeInt(pad1);
-       dos.writeInt(fixedDatumRecords.size());
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        eventType = EventReportEventType.unmarshalEnum(dis);
-        uPosition += eventType.getMarshalledSize();
-        pad1 = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumRecords.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   eventType.marshal(buff);
-   buff.putInt( (int)pad1);
-   buff.putInt( (int)fixedDatumRecords.size());
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    eventType = EventReportEventType.unmarshalEnum(buff);
-    pad1 = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumRecords.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final EventReportRPdu rhs = (EventReportRPdu)obj;
-
-     if( ! (eventType == rhs.eventType)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-        if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" eventType: ").append(eventType).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" fixedDatumRecords: ").append("\n");
-    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
deleted file mode 100644
index bc230a1638967392d2d002dd385b9f45c9e4e7fa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a EventReportRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class EventReportReliablePdu extends EventReportRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/Expendable.java b/src-generated/edu/nps/moves/dis7/Expendable.java
deleted file mode 100644
index fa4cee6c911a5de85580d99403d59abca4733b31..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Expendable.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's expendable (chaff, flares, etc) information. Section 6.2.36
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Expendable extends Object implements Serializable
-{
-   /** Type of expendable */
-   protected EntityType  expendable = new EntityType(); 
-
-   protected int  station;
-
-   protected short  quantity;
-
-   /**  uid 327 */
-   protected MunitionExpendableStatus expendableStatus = MunitionExpendableStatus.values()[0];
-
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public Expendable()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += expendable.getMarshalledSize();
-   marshalSize += 4;  // station
-   marshalSize += 2;  // quantity
-   marshalSize += expendableStatus.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Expendable#expendable}*/
-public Expendable setExpendable(EntityType pExpendable)
-{
-    expendable = pExpendable;
-    return this;
-}
-
-/** Getter for {@link Expendable#expendable}*/
-public EntityType getExpendable()
-{
-    return expendable; 
-}
-
-/** Setter for {@link Expendable#station}*/
-public Expendable setStation(int pStation)
-{
-    station = pStation;
-    return this;
-}
-
-/** Getter for {@link Expendable#station}*/
-public int getStation()
-{
-    return station; 
-}
-
-/** Setter for {@link Expendable#quantity}*/
-public Expendable setQuantity(short pQuantity)
-{
-    quantity = pQuantity;
-    return this;
-}
-
-/** Getter for {@link Expendable#quantity}*/
-public short getQuantity()
-{
-    return quantity; 
-}
-
-/** Setter for {@link Expendable#expendableStatus}*/
-public Expendable setExpendableStatus(MunitionExpendableStatus pExpendableStatus)
-{
-    expendableStatus = pExpendableStatus;
-    return this;
-}
-
-/** Getter for {@link Expendable#expendableStatus}*/
-public MunitionExpendableStatus getExpendableStatus()
-{
-    return expendableStatus; 
-}
-
-/** Setter for {@link Expendable#padding}*/
-public Expendable setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link Expendable#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       expendable.marshal(dos);
-       dos.writeInt(station);
-       dos.writeShort(quantity);
-       expendableStatus.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += expendable.unmarshal(dis);
-        station = dis.readInt();
-        uPosition += 4;
-        quantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        expendableStatus = MunitionExpendableStatus.unmarshalEnum(dis);
-        uPosition += expendableStatus.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   expendable.marshal(buff);
-   buff.putInt( (int)station);
-   buff.putShort( (short)quantity);
-   expendableStatus.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    expendable.unmarshal(buff);
-    station = buff.getInt();
-    quantity = (short)(buff.getShort() & 0xFFFF);
-    expendableStatus = MunitionExpendableStatus.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Expendable rhs = (Expendable)obj;
-
-     if( ! (expendable.equals( rhs.expendable) )) ivarsEqual = false;
-     if( ! (station == rhs.station)) ivarsEqual = false;
-     if( ! (quantity == rhs.quantity)) ivarsEqual = false;
-     if( ! (expendableStatus == rhs.expendableStatus)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" expendable: ").append(expendable).append("\n");
-    sb.append(" station: ").append(station).append("\n");
-    sb.append(" quantity: ").append(quantity).append("\n");
-    sb.append(" expendableStatus: ").append(expendableStatus).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
deleted file mode 100644
index 777b88bfec4850232cb1fbb9850cdab77c1a97bd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Burst of chaff or expendible device. Section 6.2.19.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ExpendableDescriptor extends Object implements Serializable
-{
-   /** Type of the object that exploded */
-   protected EntityType  expendableType = new EntityType(); 
-
-   /** Padding */
-   protected long  padding = (long)0;
-
-
-/** Constructor */
- public ExpendableDescriptor()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += expendableType.getMarshalledSize();
-   marshalSize += 8;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ExpendableDescriptor#expendableType}*/
-public ExpendableDescriptor setExpendableType(EntityType pExpendableType)
-{
-    expendableType = pExpendableType;
-    return this;
-}
-
-/** Getter for {@link ExpendableDescriptor#expendableType}*/
-public EntityType getExpendableType()
-{
-    return expendableType; 
-}
-
-/** Setter for {@link ExpendableDescriptor#padding}*/
-public ExpendableDescriptor setPadding(long pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link ExpendableDescriptor#padding}*/
-public long getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       expendableType.marshal(dos);
-       dos.writeLong(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += expendableType.unmarshal(dis);
-        padding = dis.readLong();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   expendableType.marshal(buff);
-   buff.putLong( (long)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    expendableType.unmarshal(buff);
-    padding = buff.getLong();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ExpendableDescriptor rhs = (ExpendableDescriptor)obj;
-
-     if( ! (expendableType.equals( rhs.expendableType) )) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" expendableType: ").append(expendableType).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableReload.java b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
deleted file mode 100644
index 1151c5afd78698b6f5a3f96e223adab17d6b55a9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ExpendableReload.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's expendable (chaff, flares, etc) information. Section 6.2.37
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ExpendableReload extends Object implements Serializable
-{
-   /** Type of expendable */
-   protected EntityType  expendable = new EntityType(); 
-
-   protected int  station;
-
-   protected short  standardQuantity;
-
-   protected short  maximumQuantity;
-
-   protected int  standardQuantityReloadTime;
-
-   protected int  maximumQuantityReloadTime;
-
-
-/** Constructor */
- public ExpendableReload()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += expendable.getMarshalledSize();
-   marshalSize += 4;  // station
-   marshalSize += 2;  // standardQuantity
-   marshalSize += 2;  // maximumQuantity
-   marshalSize += 4;  // standardQuantityReloadTime
-   marshalSize += 4;  // maximumQuantityReloadTime
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ExpendableReload#expendable}*/
-public ExpendableReload setExpendable(EntityType pExpendable)
-{
-    expendable = pExpendable;
-    return this;
-}
-
-/** Getter for {@link ExpendableReload#expendable}*/
-public EntityType getExpendable()
-{
-    return expendable; 
-}
-
-/** Setter for {@link ExpendableReload#station}*/
-public ExpendableReload setStation(int pStation)
-{
-    station = pStation;
-    return this;
-}
-
-/** Getter for {@link ExpendableReload#station}*/
-public int getStation()
-{
-    return station; 
-}
-
-/** Setter for {@link ExpendableReload#standardQuantity}*/
-public ExpendableReload setStandardQuantity(short pStandardQuantity)
-{
-    standardQuantity = pStandardQuantity;
-    return this;
-}
-
-/** Getter for {@link ExpendableReload#standardQuantity}*/
-public short getStandardQuantity()
-{
-    return standardQuantity; 
-}
-
-/** Setter for {@link ExpendableReload#maximumQuantity}*/
-public ExpendableReload setMaximumQuantity(short pMaximumQuantity)
-{
-    maximumQuantity = pMaximumQuantity;
-    return this;
-}
-
-/** Getter for {@link ExpendableReload#maximumQuantity}*/
-public short getMaximumQuantity()
-{
-    return maximumQuantity; 
-}
-
-/** Setter for {@link ExpendableReload#standardQuantityReloadTime}*/
-public ExpendableReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
-{
-    standardQuantityReloadTime = pStandardQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link ExpendableReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
-{
-    return standardQuantityReloadTime; 
-}
-
-/** Setter for {@link ExpendableReload#maximumQuantityReloadTime}*/
-public ExpendableReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
-{
-    maximumQuantityReloadTime = pMaximumQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link ExpendableReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
-{
-    return maximumQuantityReloadTime; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       expendable.marshal(dos);
-       dos.writeInt(station);
-       dos.writeShort(standardQuantity);
-       dos.writeShort(maximumQuantity);
-       dos.writeInt(standardQuantityReloadTime);
-       dos.writeInt(maximumQuantityReloadTime);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += expendable.unmarshal(dis);
-        station = dis.readInt();
-        uPosition += 4;
-        standardQuantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        maximumQuantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        standardQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-        maximumQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   expendable.marshal(buff);
-   buff.putInt( (int)station);
-   buff.putShort( (short)standardQuantity);
-   buff.putShort( (short)maximumQuantity);
-   buff.putInt( (int)standardQuantityReloadTime);
-   buff.putInt( (int)maximumQuantityReloadTime);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    expendable.unmarshal(buff);
-    station = buff.getInt();
-    standardQuantity = (short)(buff.getShort() & 0xFFFF);
-    maximumQuantity = (short)(buff.getShort() & 0xFFFF);
-    standardQuantityReloadTime = buff.getInt();
-    maximumQuantityReloadTime = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ExpendableReload rhs = (ExpendableReload)obj;
-
-     if( ! (expendable.equals( rhs.expendable) )) ivarsEqual = false;
-     if( ! (station == rhs.station)) ivarsEqual = false;
-     if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
-     if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
-     if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
-     if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" expendable: ").append(expendable).append("\n");
-    sb.append(" station: ").append(station).append("\n");
-    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
-    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
-    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
-    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
deleted file mode 100644
index ec951c860adb5beebc55adcb41b0a032902c3199..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Explosion of a non-munition. Section 6.2.19.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ExplosionDescriptor extends Object implements Serializable
-{
-   /** Type of the object that exploded. See 6.2.30 */
-   protected EntityType  explodingObject = new EntityType(); 
-
-   /** Material that exploded. Can be grain dust, tnt, gasoline, etc. Enumeration uid 310 */
-   protected ExplosiveMaterialCategories explosiveMaterial = ExplosiveMaterialCategories.values()[0];
-
-   /** padding */
-   protected short  padding = (short)0;
-
-   /** Force of explosion, in equivalent KG of TNT */
-   protected float  explosiveForce;
-
-
-/** Constructor */
- public ExplosionDescriptor()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += explodingObject.getMarshalledSize();
-   marshalSize += explosiveMaterial.getMarshalledSize();
-   marshalSize += 2;  // padding
-   marshalSize += 4;  // explosiveForce
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ExplosionDescriptor#explodingObject}*/
-public ExplosionDescriptor setExplodingObject(EntityType pExplodingObject)
-{
-    explodingObject = pExplodingObject;
-    return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#explodingObject}*/
-public EntityType getExplodingObject()
-{
-    return explodingObject; 
-}
-
-/** Setter for {@link ExplosionDescriptor#explosiveMaterial}*/
-public ExplosionDescriptor setExplosiveMaterial(ExplosiveMaterialCategories pExplosiveMaterial)
-{
-    explosiveMaterial = pExplosiveMaterial;
-    return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#explosiveMaterial}*/
-public ExplosiveMaterialCategories getExplosiveMaterial()
-{
-    return explosiveMaterial; 
-}
-
-/** Setter for {@link ExplosionDescriptor#padding}*/
-public ExplosionDescriptor setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link ExplosionDescriptor#explosiveForce}*/
-public ExplosionDescriptor setExplosiveForce(float pExplosiveForce)
-{
-    explosiveForce = pExplosiveForce;
-    return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#explosiveForce}*/
-public float getExplosiveForce()
-{
-    return explosiveForce; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       explodingObject.marshal(dos);
-       explosiveMaterial.marshal(dos);
-       dos.writeShort(padding);
-       dos.writeFloat(explosiveForce);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += explodingObject.unmarshal(dis);
-        explosiveMaterial = ExplosiveMaterialCategories.unmarshalEnum(dis);
-        uPosition += explosiveMaterial.getMarshalledSize();
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        explosiveForce = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   explodingObject.marshal(buff);
-   explosiveMaterial.marshal(buff);
-   buff.putShort( (short)padding);
-   buff.putFloat( (float)explosiveForce);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    explodingObject.unmarshal(buff);
-    explosiveMaterial = ExplosiveMaterialCategories.unmarshalEnum(buff);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    explosiveForce = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ExplosionDescriptor rhs = (ExplosionDescriptor)obj;
-
-     if( ! (explodingObject.equals( rhs.explodingObject) )) ivarsEqual = false;
-     if( ! (explosiveMaterial == rhs.explosiveMaterial)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (explosiveForce == rhs.explosiveForce)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" explodingObject: ").append(explodingObject).append("\n");
-    sb.append(" explosiveMaterial: ").append(explosiveMaterial).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" explosiveForce: ").append(explosiveForce).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
deleted file mode 100644
index 359c47b1579c9082245a697321fb789bd0bf48c1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.21.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class FalseTargetsAttribute extends Object implements Serializable
-{
-   protected int  recordType = (int)3502;
-
-   protected short  recordLength = (short)40;
-
-   protected short  padding = (short)0;
-
-   protected byte  emitterNumber;
-
-   protected byte  beamNumber;
-
-   /**  uid 300 */
-   protected EEAttributeStateIndicator stateIndicator = EEAttributeStateIndicator.values()[0];
-
-   protected byte  padding2 = (byte)0;
-
-   protected short  padding3 = (short)0;
-
-   protected short  falseTargetCount;
-
-   protected float  walkSpeed;
-
-   protected float  walkAcceleration;
-
-   protected float  maximumWalkDistance;
-
-   protected float  keepTime;
-
-   protected float  echoSpacing;
-
-   protected float  firstTargetOffset;
-
-
-/** Constructor */
- public FalseTargetsAttribute()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // recordType
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // padding
-   marshalSize += 1;  // emitterNumber
-   marshalSize += 1;  // beamNumber
-   marshalSize += stateIndicator.getMarshalledSize();
-   marshalSize += 1;  // padding2
-   marshalSize += 2;  // padding3
-   marshalSize += 2;  // falseTargetCount
-   marshalSize += 4;  // walkSpeed
-   marshalSize += 4;  // walkAcceleration
-   marshalSize += 4;  // maximumWalkDistance
-   marshalSize += 4;  // keepTime
-   marshalSize += 4;  // echoSpacing
-   marshalSize += 4;  // firstTargetOffset
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link FalseTargetsAttribute#recordType}*/
-public FalseTargetsAttribute setRecordType(int pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#recordType}*/
-public int getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#recordLength}*/
-public FalseTargetsAttribute setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#padding}*/
-public FalseTargetsAttribute setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#emitterNumber}*/
-public FalseTargetsAttribute setEmitterNumber(byte pEmitterNumber)
-{
-    emitterNumber = pEmitterNumber;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#emitterNumber}*/
-public byte getEmitterNumber()
-{
-    return emitterNumber; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#beamNumber}*/
-public FalseTargetsAttribute setBeamNumber(byte pBeamNumber)
-{
-    beamNumber = pBeamNumber;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#beamNumber}*/
-public byte getBeamNumber()
-{
-    return beamNumber; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#stateIndicator}*/
-public FalseTargetsAttribute setStateIndicator(EEAttributeStateIndicator pStateIndicator)
-{
-    stateIndicator = pStateIndicator;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#stateIndicator}*/
-public EEAttributeStateIndicator getStateIndicator()
-{
-    return stateIndicator; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#padding2}*/
-public FalseTargetsAttribute setPadding2(byte pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#padding2}*/
-public byte getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#padding3}*/
-public FalseTargetsAttribute setPadding3(short pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#padding3}*/
-public short getPadding3()
-{
-    return padding3; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#falseTargetCount}*/
-public FalseTargetsAttribute setFalseTargetCount(short pFalseTargetCount)
-{
-    falseTargetCount = pFalseTargetCount;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#falseTargetCount}*/
-public short getFalseTargetCount()
-{
-    return falseTargetCount; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#walkSpeed}*/
-public FalseTargetsAttribute setWalkSpeed(float pWalkSpeed)
-{
-    walkSpeed = pWalkSpeed;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#walkSpeed}*/
-public float getWalkSpeed()
-{
-    return walkSpeed; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#walkAcceleration}*/
-public FalseTargetsAttribute setWalkAcceleration(float pWalkAcceleration)
-{
-    walkAcceleration = pWalkAcceleration;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#walkAcceleration}*/
-public float getWalkAcceleration()
-{
-    return walkAcceleration; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#maximumWalkDistance}*/
-public FalseTargetsAttribute setMaximumWalkDistance(float pMaximumWalkDistance)
-{
-    maximumWalkDistance = pMaximumWalkDistance;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#maximumWalkDistance}*/
-public float getMaximumWalkDistance()
-{
-    return maximumWalkDistance; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#keepTime}*/
-public FalseTargetsAttribute setKeepTime(float pKeepTime)
-{
-    keepTime = pKeepTime;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#keepTime}*/
-public float getKeepTime()
-{
-    return keepTime; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#echoSpacing}*/
-public FalseTargetsAttribute setEchoSpacing(float pEchoSpacing)
-{
-    echoSpacing = pEchoSpacing;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#echoSpacing}*/
-public float getEchoSpacing()
-{
-    return echoSpacing; 
-}
-
-/** Setter for {@link FalseTargetsAttribute#firstTargetOffset}*/
-public FalseTargetsAttribute setFirstTargetOffset(float pFirstTargetOffset)
-{
-    firstTargetOffset = pFirstTargetOffset;
-    return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#firstTargetOffset}*/
-public float getFirstTargetOffset()
-{
-    return firstTargetOffset; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordType);
-       dos.writeShort(recordLength);
-       dos.writeShort(padding);
-       dos.writeByte(emitterNumber);
-       dos.writeByte(beamNumber);
-       stateIndicator.marshal(dos);
-       dos.writeByte(padding2);
-       dos.writeShort(padding3);
-       dos.writeShort(falseTargetCount);
-       dos.writeFloat(walkSpeed);
-       dos.writeFloat(walkAcceleration);
-       dos.writeFloat(maximumWalkDistance);
-       dos.writeFloat(keepTime);
-       dos.writeFloat(echoSpacing);
-       dos.writeFloat(firstTargetOffset);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        emitterNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
-        uPosition += stateIndicator.getMarshalledSize();
-        padding2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding3 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        falseTargetCount = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        walkSpeed = dis.readFloat();
-        uPosition += 4;
-        walkAcceleration = dis.readFloat();
-        uPosition += 4;
-        maximumWalkDistance = dis.readFloat();
-        uPosition += 4;
-        keepTime = dis.readFloat();
-        uPosition += 4;
-        echoSpacing = dis.readFloat();
-        uPosition += 4;
-        firstTargetOffset = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordType);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)padding);
-   buff.put( (byte)emitterNumber);
-   buff.put( (byte)beamNumber);
-   stateIndicator.marshal(buff);
-   buff.put( (byte)padding2);
-   buff.putShort( (short)padding3);
-   buff.putShort( (short)falseTargetCount);
-   buff.putFloat( (float)walkSpeed);
-   buff.putFloat( (float)walkAcceleration);
-   buff.putFloat( (float)maximumWalkDistance);
-   buff.putFloat( (float)keepTime);
-   buff.putFloat( (float)echoSpacing);
-   buff.putFloat( (float)firstTargetOffset);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    emitterNumber = (byte)(buff.get() & 0xFF);
-    beamNumber = (byte)(buff.get() & 0xFF);
-    stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
-    padding2 = (byte)(buff.get() & 0xFF);
-    padding3 = (short)(buff.getShort() & 0xFFFF);
-    falseTargetCount = (short)(buff.getShort() & 0xFFFF);
-    walkSpeed = buff.getFloat();
-    walkAcceleration = buff.getFloat();
-    maximumWalkDistance = buff.getFloat();
-    keepTime = buff.getFloat();
-    echoSpacing = buff.getFloat();
-    firstTargetOffset = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final FalseTargetsAttribute rhs = (FalseTargetsAttribute)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
-     if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
-     if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-     if( ! (falseTargetCount == rhs.falseTargetCount)) ivarsEqual = false;
-     if( ! (walkSpeed == rhs.walkSpeed)) ivarsEqual = false;
-     if( ! (walkAcceleration == rhs.walkAcceleration)) ivarsEqual = false;
-     if( ! (maximumWalkDistance == rhs.maximumWalkDistance)) ivarsEqual = false;
-     if( ! (keepTime == rhs.keepTime)) ivarsEqual = false;
-     if( ! (echoSpacing == rhs.echoSpacing)) ivarsEqual = false;
-     if( ! (firstTargetOffset == rhs.firstTargetOffset)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
-    sb.append(" beamNumber: ").append(beamNumber).append("\n");
-    sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-    sb.append(" falseTargetCount: ").append(falseTargetCount).append("\n");
-    sb.append(" walkSpeed: ").append(walkSpeed).append("\n");
-    sb.append(" walkAcceleration: ").append(walkAcceleration).append("\n");
-    sb.append(" maximumWalkDistance: ").append(maximumWalkDistance).append("\n");
-    sb.append(" keepTime: ").append(keepTime).append("\n");
-    sb.append(" echoSpacing: ").append(echoSpacing).append("\n");
-    sb.append(" firstTargetOffset: ").append(firstTargetOffset).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
deleted file mode 100644
index 2fc2e00db5e2c81ecabc09b4e419e13d730167db..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class FastEntityStatePdu extends EntityInformationFamilyPdu implements Serializable
-{
-   /** The site ID */
-   protected short  site;
-
-   /** The application ID */
-   protected short  application;
-
-   /** the entity ID */
-   protected short  entity;
-
-   /** what force this entity is affiliated with, eg red, blue, neutral, etc */
-   protected byte  forceId;
-
-   /** How many variable (nee articulation) parameters are in the variable length list */
-   protected byte  numberOfVariableParameters;
-
-   /** Kind of entity */
-   protected byte  entityKind;
-
-   /** Domain of entity (air, surface, subsurface, space, etc) */
-   protected byte  domain;
-
-   /** country to which the design of the entity is attributed */
-   protected short  country;
-
-   /** category of entity */
-   protected byte  category;
-
-   /** subcategory of entity */
-   protected byte  subcategory;
-
-   /** specific info based on subcategory field */
-   protected byte  specific;
-
-   protected byte  extra;
-
-   /** Kind of entity */
-   protected byte  altEntityKind;
-
-   /** Domain of entity (air, surface, subsurface, space, etc) */
-   protected byte  altDomain;
-
-   /** country to which the design of the entity is attributed */
-   protected short  altCountry;
-
-   /** category of entity */
-   protected byte  altCategory;
-
-   /** subcategory of entity */
-   protected byte  altSubcategory;
-
-   /** specific info based on subcategory field */
-   protected byte  altSpecific;
-
-   protected byte  altExtra;
-
-   /** X velo */
-   protected float  xVelocity;
-
-   /** y Value */
-   protected float  yVelocity;
-
-   /** Z value */
-   protected float  zVelocity;
-
-   /** X value */
-   protected double  xLocation;
-
-   /** y Value */
-   protected double  yLocation;
-
-   /** Z value */
-   protected double  zLocation;
-
-   protected float  psi;
-
-   protected float  theta;
-
-   protected float  phi;
-
-   /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */
-   protected int  entityAppearance;
-
-   /** enumeration of what dead reckoning algorighm to use */
-   protected byte  deadReckoningAlgorithm;
-
-   /** other parameters to use in the dead reckoning algorithm */
-   protected byte[]  otherParameters = new byte[15]; 
-
-   /** X value */
-   protected float  xAcceleration;
-
-   /** y Value */
-   protected float  yAcceleration;
-
-   /** Z value */
-   protected float  zAcceleration;
-
-   /** X value */
-   protected float  xAngularVelocity;
-
-   /** y Value */
-   protected float  yAngularVelocity;
-
-   /** Z value */
-   protected float  zAngularVelocity;
-
-   /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */
-   protected byte[]  marking = new byte[12]; 
-
-   /** a series of bit flags */
-   protected short  capabilities;
-
-   /** variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters */
-   protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
- 
-
-/** Constructor */
- public FastEntityStatePdu()
- {
-    setPduType( DISPDUType.ENTITY_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 2;  // site
-   marshalSize += 2;  // application
-   marshalSize += 2;  // entity
-   marshalSize += 1;  // forceId
-   marshalSize += 1;  // numberOfVariableParameters
-   marshalSize += 1;  // entityKind
-   marshalSize += 1;  // domain
-   marshalSize += 2;  // country
-   marshalSize += 1;  // category
-   marshalSize += 1;  // subcategory
-   marshalSize += 1;  // specific
-   marshalSize += 1;  // extra
-   marshalSize += 1;  // altEntityKind
-   marshalSize += 1;  // altDomain
-   marshalSize += 2;  // altCountry
-   marshalSize += 1;  // altCategory
-   marshalSize += 1;  // altSubcategory
-   marshalSize += 1;  // altSpecific
-   marshalSize += 1;  // altExtra
-   marshalSize += 4;  // xVelocity
-   marshalSize += 4;  // yVelocity
-   marshalSize += 4;  // zVelocity
-   marshalSize += 8;  // xLocation
-   marshalSize += 8;  // yLocation
-   marshalSize += 8;  // zLocation
-   marshalSize += 4;  // psi
-   marshalSize += 4;  // theta
-   marshalSize += 4;  // phi
-   marshalSize += 4;  // entityAppearance
-   marshalSize += 1;  // deadReckoningAlgorithm
-   marshalSize += otherParameters.length * 1;
-   marshalSize += 4;  // xAcceleration
-   marshalSize += 4;  // yAcceleration
-   marshalSize += 4;  // zAcceleration
-   marshalSize += 4;  // xAngularVelocity
-   marshalSize += 4;  // yAngularVelocity
-   marshalSize += 4;  // zAngularVelocity
-   marshalSize += marking.length * 1;
-   marshalSize += 2;  // capabilities
-   for(int idx=0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter listElement = variableParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link FastEntityStatePdu#site}*/
-public FastEntityStatePdu setSite(short pSite)
-{
-    site = pSite;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#site}*/
-public short getSite()
-{
-    return site; 
-}
-
-/** Setter for {@link FastEntityStatePdu#application}*/
-public FastEntityStatePdu setApplication(short pApplication)
-{
-    application = pApplication;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#application}*/
-public short getApplication()
-{
-    return application; 
-}
-
-/** Setter for {@link FastEntityStatePdu#entity}*/
-public FastEntityStatePdu setEntity(short pEntity)
-{
-    entity = pEntity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#entity}*/
-public short getEntity()
-{
-    return entity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#forceId}*/
-public FastEntityStatePdu setForceId(byte pForceId)
-{
-    forceId = pForceId;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#forceId}*/
-public byte getForceId()
-{
-    return forceId; 
-}
-
-/** Setter for {@link FastEntityStatePdu#entityKind}*/
-public FastEntityStatePdu setEntityKind(byte pEntityKind)
-{
-    entityKind = pEntityKind;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#entityKind}*/
-public byte getEntityKind()
-{
-    return entityKind; 
-}
-
-/** Setter for {@link FastEntityStatePdu#domain}*/
-public FastEntityStatePdu setDomain(byte pDomain)
-{
-    domain = pDomain;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#domain}*/
-public byte getDomain()
-{
-    return domain; 
-}
-
-/** Setter for {@link FastEntityStatePdu#country}*/
-public FastEntityStatePdu setCountry(short pCountry)
-{
-    country = pCountry;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#country}*/
-public short getCountry()
-{
-    return country; 
-}
-
-/** Setter for {@link FastEntityStatePdu#category}*/
-public FastEntityStatePdu setCategory(byte pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#category}*/
-public byte getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link FastEntityStatePdu#subcategory}*/
-public FastEntityStatePdu setSubcategory(byte pSubcategory)
-{
-    subcategory = pSubcategory;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#subcategory}*/
-public byte getSubcategory()
-{
-    return subcategory; 
-}
-
-/** Setter for {@link FastEntityStatePdu#specific}*/
-public FastEntityStatePdu setSpecific(byte pSpecific)
-{
-    specific = pSpecific;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#specific}*/
-public byte getSpecific()
-{
-    return specific; 
-}
-
-/** Setter for {@link FastEntityStatePdu#extra}*/
-public FastEntityStatePdu setExtra(byte pExtra)
-{
-    extra = pExtra;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#extra}*/
-public byte getExtra()
-{
-    return extra; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altEntityKind}*/
-public FastEntityStatePdu setAltEntityKind(byte pAltEntityKind)
-{
-    altEntityKind = pAltEntityKind;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altEntityKind}*/
-public byte getAltEntityKind()
-{
-    return altEntityKind; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altDomain}*/
-public FastEntityStatePdu setAltDomain(byte pAltDomain)
-{
-    altDomain = pAltDomain;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altDomain}*/
-public byte getAltDomain()
-{
-    return altDomain; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altCountry}*/
-public FastEntityStatePdu setAltCountry(short pAltCountry)
-{
-    altCountry = pAltCountry;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altCountry}*/
-public short getAltCountry()
-{
-    return altCountry; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altCategory}*/
-public FastEntityStatePdu setAltCategory(byte pAltCategory)
-{
-    altCategory = pAltCategory;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altCategory}*/
-public byte getAltCategory()
-{
-    return altCategory; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altSubcategory}*/
-public FastEntityStatePdu setAltSubcategory(byte pAltSubcategory)
-{
-    altSubcategory = pAltSubcategory;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altSubcategory}*/
-public byte getAltSubcategory()
-{
-    return altSubcategory; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altSpecific}*/
-public FastEntityStatePdu setAltSpecific(byte pAltSpecific)
-{
-    altSpecific = pAltSpecific;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altSpecific}*/
-public byte getAltSpecific()
-{
-    return altSpecific; 
-}
-
-/** Setter for {@link FastEntityStatePdu#altExtra}*/
-public FastEntityStatePdu setAltExtra(byte pAltExtra)
-{
-    altExtra = pAltExtra;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altExtra}*/
-public byte getAltExtra()
-{
-    return altExtra; 
-}
-
-/** Setter for {@link FastEntityStatePdu#xVelocity}*/
-public FastEntityStatePdu setXVelocity(float pXVelocity)
-{
-    xVelocity = pXVelocity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xVelocity}*/
-public float getXVelocity()
-{
-    return xVelocity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#yVelocity}*/
-public FastEntityStatePdu setYVelocity(float pYVelocity)
-{
-    yVelocity = pYVelocity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yVelocity}*/
-public float getYVelocity()
-{
-    return yVelocity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#zVelocity}*/
-public FastEntityStatePdu setZVelocity(float pZVelocity)
-{
-    zVelocity = pZVelocity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zVelocity}*/
-public float getZVelocity()
-{
-    return zVelocity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#xLocation}*/
-public FastEntityStatePdu setXLocation(double pXLocation)
-{
-    xLocation = pXLocation;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xLocation}*/
-public double getXLocation()
-{
-    return xLocation; 
-}
-
-/** Setter for {@link FastEntityStatePdu#yLocation}*/
-public FastEntityStatePdu setYLocation(double pYLocation)
-{
-    yLocation = pYLocation;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yLocation}*/
-public double getYLocation()
-{
-    return yLocation; 
-}
-
-/** Setter for {@link FastEntityStatePdu#zLocation}*/
-public FastEntityStatePdu setZLocation(double pZLocation)
-{
-    zLocation = pZLocation;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zLocation}*/
-public double getZLocation()
-{
-    return zLocation; 
-}
-
-/** Setter for {@link FastEntityStatePdu#psi}*/
-public FastEntityStatePdu setPsi(float pPsi)
-{
-    psi = pPsi;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#psi}*/
-public float getPsi()
-{
-    return psi; 
-}
-
-/** Setter for {@link FastEntityStatePdu#theta}*/
-public FastEntityStatePdu setTheta(float pTheta)
-{
-    theta = pTheta;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#theta}*/
-public float getTheta()
-{
-    return theta; 
-}
-
-/** Setter for {@link FastEntityStatePdu#phi}*/
-public FastEntityStatePdu setPhi(float pPhi)
-{
-    phi = pPhi;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#phi}*/
-public float getPhi()
-{
-    return phi; 
-}
-
-/** Setter for {@link FastEntityStatePdu#entityAppearance}*/
-public FastEntityStatePdu setEntityAppearance(int pEntityAppearance)
-{
-    entityAppearance = pEntityAppearance;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#entityAppearance}*/
-public int getEntityAppearance()
-{
-    return entityAppearance; 
-}
-
-/** Setter for {@link FastEntityStatePdu#deadReckoningAlgorithm}*/
-public FastEntityStatePdu setDeadReckoningAlgorithm(byte pDeadReckoningAlgorithm)
-{
-    deadReckoningAlgorithm = pDeadReckoningAlgorithm;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#deadReckoningAlgorithm}*/
-public byte getDeadReckoningAlgorithm()
-{
-    return deadReckoningAlgorithm; 
-}
-
-/** Setter for {@link FastEntityStatePdu#otherParameters}*/
-public FastEntityStatePdu setOtherParameters(byte[] pOtherParameters)
-{
-    otherParameters = Arrays.copyOf(pOtherParameters, otherParameters.length);
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#otherParameters}*/
-public byte[] getOtherParameters()
-{
-    return otherParameters; 
-}
-
-/** Setter for {@link FastEntityStatePdu#xAcceleration}*/
-public FastEntityStatePdu setXAcceleration(float pXAcceleration)
-{
-    xAcceleration = pXAcceleration;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xAcceleration}*/
-public float getXAcceleration()
-{
-    return xAcceleration; 
-}
-
-/** Setter for {@link FastEntityStatePdu#yAcceleration}*/
-public FastEntityStatePdu setYAcceleration(float pYAcceleration)
-{
-    yAcceleration = pYAcceleration;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yAcceleration}*/
-public float getYAcceleration()
-{
-    return yAcceleration; 
-}
-
-/** Setter for {@link FastEntityStatePdu#zAcceleration}*/
-public FastEntityStatePdu setZAcceleration(float pZAcceleration)
-{
-    zAcceleration = pZAcceleration;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zAcceleration}*/
-public float getZAcceleration()
-{
-    return zAcceleration; 
-}
-
-/** Setter for {@link FastEntityStatePdu#xAngularVelocity}*/
-public FastEntityStatePdu setXAngularVelocity(float pXAngularVelocity)
-{
-    xAngularVelocity = pXAngularVelocity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xAngularVelocity}*/
-public float getXAngularVelocity()
-{
-    return xAngularVelocity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#yAngularVelocity}*/
-public FastEntityStatePdu setYAngularVelocity(float pYAngularVelocity)
-{
-    yAngularVelocity = pYAngularVelocity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yAngularVelocity}*/
-public float getYAngularVelocity()
-{
-    return yAngularVelocity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#zAngularVelocity}*/
-public FastEntityStatePdu setZAngularVelocity(float pZAngularVelocity)
-{
-    zAngularVelocity = pZAngularVelocity;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zAngularVelocity}*/
-public float getZAngularVelocity()
-{
-    return zAngularVelocity; 
-}
-
-/** Setter for {@link FastEntityStatePdu#marking}*/
-public FastEntityStatePdu setMarking(byte[] pMarking)
-{
-    marking = Arrays.copyOf(pMarking, marking.length);
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#marking}*/
-public byte[] getMarking()
-{
-    return marking; 
-}
-
-/** Setter for {@link FastEntityStatePdu#capabilities}*/
-public FastEntityStatePdu setCapabilities(short pCapabilities)
-{
-    capabilities = pCapabilities;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#capabilities}*/
-public short getCapabilities()
-{
-    return capabilities; 
-}
-
-/** Setter for {@link FastEntityStatePdu#variableParameters}*/
-public FastEntityStatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
-{
-    variableParameters = pVariableParameters;
-    return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
-{
-    return variableParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeShort(site);
-       dos.writeShort(application);
-       dos.writeShort(entity);
-       dos.writeByte(forceId);
-       dos.writeByte(variableParameters.size());
-       dos.writeByte(entityKind);
-       dos.writeByte(domain);
-       dos.writeShort(country);
-       dos.writeByte(category);
-       dos.writeByte(subcategory);
-       dos.writeByte(specific);
-       dos.writeByte(extra);
-       dos.writeByte(altEntityKind);
-       dos.writeByte(altDomain);
-       dos.writeShort(altCountry);
-       dos.writeByte(altCategory);
-       dos.writeByte(altSubcategory);
-       dos.writeByte(altSpecific);
-       dos.writeByte(altExtra);
-       dos.writeFloat(xVelocity);
-       dos.writeFloat(yVelocity);
-       dos.writeFloat(zVelocity);
-       dos.writeDouble(xLocation);
-       dos.writeDouble(yLocation);
-       dos.writeDouble(zLocation);
-       dos.writeFloat(psi);
-       dos.writeFloat(theta);
-       dos.writeFloat(phi);
-       dos.writeInt(entityAppearance);
-       dos.writeByte(deadReckoningAlgorithm);
-
-       for(int idx = 0; idx < otherParameters.length; idx++)
-           dos.writeByte(otherParameters[idx]);
-
-       dos.writeFloat(xAcceleration);
-       dos.writeFloat(yAcceleration);
-       dos.writeFloat(zAcceleration);
-       dos.writeFloat(xAngularVelocity);
-       dos.writeFloat(yAngularVelocity);
-       dos.writeFloat(zAngularVelocity);
-
-       for(int idx = 0; idx < marking.length; idx++)
-           dos.writeByte(marking[idx]);
-
-       dos.writeShort(capabilities);
-
-       for(int idx = 0; idx < variableParameters.size(); idx++)
-       {
-            VariableParameter aVariableParameter = variableParameters.get(idx);
-            aVariableParameter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        site = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        application = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        entity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        forceId = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfVariableParameters = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        entityKind = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        domain = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        country = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        category = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        subcategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        specific = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        extra = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        altEntityKind = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        altDomain = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        altCountry = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        altCategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        altSubcategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        altSpecific = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        altExtra = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        xVelocity = dis.readFloat();
-        uPosition += 4;
-        yVelocity = dis.readFloat();
-        uPosition += 4;
-        zVelocity = dis.readFloat();
-        uPosition += 4;
-        xLocation = dis.readDouble();
-        uPosition += 4;
-        yLocation = dis.readDouble();
-        uPosition += 4;
-        zLocation = dis.readDouble();
-        uPosition += 4;
-        psi = dis.readFloat();
-        uPosition += 4;
-        theta = dis.readFloat();
-        uPosition += 4;
-        phi = dis.readFloat();
-        uPosition += 4;
-        entityAppearance = dis.readInt();
-        uPosition += 4;
-        deadReckoningAlgorithm = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        for(int idx = 0; idx < otherParameters.length; idx++)
-            otherParameters[idx] = dis.readByte();
-        uPosition += (otherParameters.length * 1);
-        xAcceleration = dis.readFloat();
-        uPosition += 4;
-        yAcceleration = dis.readFloat();
-        uPosition += 4;
-        zAcceleration = dis.readFloat();
-        uPosition += 4;
-        xAngularVelocity = dis.readFloat();
-        uPosition += 4;
-        yAngularVelocity = dis.readFloat();
-        uPosition += 4;
-        zAngularVelocity = dis.readFloat();
-        uPosition += 4;
-        for(int idx = 0; idx < marking.length; idx++)
-            marking[idx] = dis.readByte();
-        uPosition += (marking.length * 1);
-        capabilities = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfVariableParameters; idx++)
-        {
-            VariableParameter anX = new VariableParameter();
-            uPosition += anX.unmarshal(dis);
-            variableParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putShort( (short)site);
-   buff.putShort( (short)application);
-   buff.putShort( (short)entity);
-   buff.put( (byte)forceId);
-   buff.put( (byte)variableParameters.size());
-   buff.put( (byte)entityKind);
-   buff.put( (byte)domain);
-   buff.putShort( (short)country);
-   buff.put( (byte)category);
-   buff.put( (byte)subcategory);
-   buff.put( (byte)specific);
-   buff.put( (byte)extra);
-   buff.put( (byte)altEntityKind);
-   buff.put( (byte)altDomain);
-   buff.putShort( (short)altCountry);
-   buff.put( (byte)altCategory);
-   buff.put( (byte)altSubcategory);
-   buff.put( (byte)altSpecific);
-   buff.put( (byte)altExtra);
-   buff.putFloat( (float)xVelocity);
-   buff.putFloat( (float)yVelocity);
-   buff.putFloat( (float)zVelocity);
-   buff.putDouble( (double)xLocation);
-   buff.putDouble( (double)yLocation);
-   buff.putDouble( (double)zLocation);
-   buff.putFloat( (float)psi);
-   buff.putFloat( (float)theta);
-   buff.putFloat( (float)phi);
-   buff.putInt( (int)entityAppearance);
-   buff.put( (byte)deadReckoningAlgorithm);
-
-   for(int idx = 0; idx < otherParameters.length; idx++)
-       buff.put((byte)otherParameters[idx]);
-
-   buff.putFloat( (float)xAcceleration);
-   buff.putFloat( (float)yAcceleration);
-   buff.putFloat( (float)zAcceleration);
-   buff.putFloat( (float)xAngularVelocity);
-   buff.putFloat( (float)yAngularVelocity);
-   buff.putFloat( (float)zAngularVelocity);
-
-   for(int idx = 0; idx < marking.length; idx++)
-       buff.put((byte)marking[idx]);
-
-   buff.putShort( (short)capabilities);
-
-   for(int idx = 0; idx < variableParameters.size(); idx++)
-   {
-        VariableParameter aVariableParameter = variableParameters.get(idx);
-        aVariableParameter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    site = (short)(buff.getShort() & 0xFFFF);
-    application = (short)(buff.getShort() & 0xFFFF);
-    entity = (short)(buff.getShort() & 0xFFFF);
-    forceId = (byte)(buff.get() & 0xFF);
-    numberOfVariableParameters = (byte)(buff.get() & 0xFF);
-    entityKind = (byte)(buff.get() & 0xFF);
-    domain = (byte)(buff.get() & 0xFF);
-    country = (short)(buff.getShort() & 0xFFFF);
-    category = (byte)(buff.get() & 0xFF);
-    subcategory = (byte)(buff.get() & 0xFF);
-    specific = (byte)(buff.get() & 0xFF);
-    extra = (byte)(buff.get() & 0xFF);
-    altEntityKind = (byte)(buff.get() & 0xFF);
-    altDomain = (byte)(buff.get() & 0xFF);
-    altCountry = (short)(buff.getShort() & 0xFFFF);
-    altCategory = (byte)(buff.get() & 0xFF);
-    altSubcategory = (byte)(buff.get() & 0xFF);
-    altSpecific = (byte)(buff.get() & 0xFF);
-    altExtra = (byte)(buff.get() & 0xFF);
-    xVelocity = buff.getFloat();
-    yVelocity = buff.getFloat();
-    zVelocity = buff.getFloat();
-    xLocation = buff.getDouble();
-    yLocation = buff.getDouble();
-    zLocation = buff.getDouble();
-    psi = buff.getFloat();
-    theta = buff.getFloat();
-    phi = buff.getFloat();
-    entityAppearance = buff.getInt();
-    deadReckoningAlgorithm = (byte)(buff.get() & 0xFF);
-    for(int idx = 0; idx < otherParameters.length; idx++)
-        otherParameters[idx] = buff.get();
-    xAcceleration = buff.getFloat();
-    yAcceleration = buff.getFloat();
-    zAcceleration = buff.getFloat();
-    xAngularVelocity = buff.getFloat();
-    yAngularVelocity = buff.getFloat();
-    zAngularVelocity = buff.getFloat();
-    for(int idx = 0; idx < marking.length; idx++)
-        marking[idx] = buff.get();
-    capabilities = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfVariableParameters; idx++)
-    {
-    VariableParameter anX = new VariableParameter();
-    anX.unmarshal(buff);
-    variableParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final FastEntityStatePdu rhs = (FastEntityStatePdu)obj;
-
-     if( ! (site == rhs.site)) ivarsEqual = false;
-     if( ! (application == rhs.application)) ivarsEqual = false;
-     if( ! (entity == rhs.entity)) ivarsEqual = false;
-     if( ! (forceId == rhs.forceId)) ivarsEqual = false;
-     if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
-     if( ! (domain == rhs.domain)) ivarsEqual = false;
-     if( ! (country == rhs.country)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
-     if( ! (specific == rhs.specific)) ivarsEqual = false;
-     if( ! (extra == rhs.extra)) ivarsEqual = false;
-     if( ! (altEntityKind == rhs.altEntityKind)) ivarsEqual = false;
-     if( ! (altDomain == rhs.altDomain)) ivarsEqual = false;
-     if( ! (altCountry == rhs.altCountry)) ivarsEqual = false;
-     if( ! (altCategory == rhs.altCategory)) ivarsEqual = false;
-     if( ! (altSubcategory == rhs.altSubcategory)) ivarsEqual = false;
-     if( ! (altSpecific == rhs.altSpecific)) ivarsEqual = false;
-     if( ! (altExtra == rhs.altExtra)) ivarsEqual = false;
-     if( ! (xVelocity == rhs.xVelocity)) ivarsEqual = false;
-     if( ! (yVelocity == rhs.yVelocity)) ivarsEqual = false;
-     if( ! (zVelocity == rhs.zVelocity)) ivarsEqual = false;
-     if( ! (xLocation == rhs.xLocation)) ivarsEqual = false;
-     if( ! (yLocation == rhs.yLocation)) ivarsEqual = false;
-     if( ! (zLocation == rhs.zLocation)) ivarsEqual = false;
-     if( ! (psi == rhs.psi)) ivarsEqual = false;
-     if( ! (theta == rhs.theta)) ivarsEqual = false;
-     if( ! (phi == rhs.phi)) ivarsEqual = false;
-     if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
-     if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 15; idx++)
-     {
-          if(!(otherParameters[idx] == rhs.otherParameters[idx])) ivarsEqual = false;
-     }
-
-     if( ! (xAcceleration == rhs.xAcceleration)) ivarsEqual = false;
-     if( ! (yAcceleration == rhs.yAcceleration)) ivarsEqual = false;
-     if( ! (zAcceleration == rhs.zAcceleration)) ivarsEqual = false;
-     if( ! (xAngularVelocity == rhs.xAngularVelocity)) ivarsEqual = false;
-     if( ! (yAngularVelocity == rhs.yAngularVelocity)) ivarsEqual = false;
-     if( ! (zAngularVelocity == rhs.zAngularVelocity)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 12; idx++)
-     {
-          if(!(marking[idx] == rhs.marking[idx])) ivarsEqual = false;
-     }
-
-     if( ! (capabilities == rhs.capabilities)) ivarsEqual = false;
-
-     for(int idx = 0; idx < variableParameters.size(); idx++)
-        if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" site: ").append(site).append("\n");
-    sb.append(" application: ").append(application).append("\n");
-    sb.append(" entity: ").append(entity).append("\n");
-    sb.append(" forceId: ").append(forceId).append("\n");
-    sb.append(" entityKind: ").append(entityKind).append("\n");
-    sb.append(" domain: ").append(domain).append("\n");
-    sb.append(" country: ").append(country).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subcategory: ").append(subcategory).append("\n");
-    sb.append(" specific: ").append(specific).append("\n");
-    sb.append(" extra: ").append(extra).append("\n");
-    sb.append(" altEntityKind: ").append(altEntityKind).append("\n");
-    sb.append(" altDomain: ").append(altDomain).append("\n");
-    sb.append(" altCountry: ").append(altCountry).append("\n");
-    sb.append(" altCategory: ").append(altCategory).append("\n");
-    sb.append(" altSubcategory: ").append(altSubcategory).append("\n");
-    sb.append(" altSpecific: ").append(altSpecific).append("\n");
-    sb.append(" altExtra: ").append(altExtra).append("\n");
-    sb.append(" xVelocity: ").append(xVelocity).append("\n");
-    sb.append(" yVelocity: ").append(yVelocity).append("\n");
-    sb.append(" zVelocity: ").append(zVelocity).append("\n");
-    sb.append(" xLocation: ").append(xLocation).append("\n");
-    sb.append(" yLocation: ").append(yLocation).append("\n");
-    sb.append(" zLocation: ").append(zLocation).append("\n");
-    sb.append(" psi: ").append(psi).append("\n");
-    sb.append(" theta: ").append(theta).append("\n");
-    sb.append(" phi: ").append(phi).append("\n");
-    sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
-    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
-    sb.append(" otherParameters: ").append("\n");
-    sb.append(Arrays.toString(otherParameters)).append("\n");
-    sb.append(" xAcceleration: ").append(xAcceleration).append("\n");
-    sb.append(" yAcceleration: ").append(yAcceleration).append("\n");
-    sb.append(" zAcceleration: ").append(zAcceleration).append("\n");
-    sb.append(" xAngularVelocity: ").append(xAngularVelocity).append("\n");
-    sb.append(" yAngularVelocity: ").append(yAngularVelocity).append("\n");
-    sb.append(" zAngularVelocity: ").append(zAngularVelocity).append("\n");
-    sb.append(" marking: ").append("\n");
-    sb.append(Arrays.toString(marking)).append("\n");
-    sb.append(" capabilities: ").append(capabilities).append("\n");
-    sb.append(" variableParameters: ").append("\n");
-    variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FirePdu.java b/src-generated/edu/nps/moves/dis7/FirePdu.java
deleted file mode 100644
index 864185c510f6354c009c52628ee6509855435e18..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/FirePdu.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.2 Used to communicate the firing of a weapon or expendable.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class FirePdu extends WarfareFamilyPdu implements Serializable
-{
-   /** ID of the entity that shot */
-   protected EntityID  firingEntityID = new EntityID(); 
-
-   /** ID of the entity that is being shot at */
-   protected EntityID  targetEntityID = new EntityID(); 
-
-   /** This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28). */
-   protected EntityID  munitionExpendibleID = new EntityID(); 
-
-   /** This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34). */
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** This field shall identify the fire mission (see 5.4.3.3). This field shall be represented by a 32-bit unsigned integer. */
-   protected int  fireMissionIndex;
-
-   /** This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97). */
-   protected Vector3Double  locationInWorldCoordinates = new Vector3Double(); 
-
-   /** This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4). */
-   protected MunitionDescriptor  descriptor = new MunitionDescriptor(); 
-
-   /** This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]. */
-   protected Vector3Float  velocity = new Vector3Float(); 
-
-   /** This field shall specify the range that an entity's fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero. */
-   protected float  range;
-
-
-/** Constructor */
- public FirePdu()
- {
-    setPduType( DISPDUType.FIRE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += firingEntityID.getMarshalledSize();
-   marshalSize += targetEntityID.getMarshalledSize();
-   marshalSize += munitionExpendibleID.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += 4;  // fireMissionIndex
-   marshalSize += locationInWorldCoordinates.getMarshalledSize();
-   marshalSize += descriptor.getMarshalledSize();
-   marshalSize += velocity.getMarshalledSize();
-   marshalSize += 4;  // range
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link FirePdu#firingEntityID}*/
-public FirePdu setFiringEntityID(EntityID pFiringEntityID)
-{
-    firingEntityID = pFiringEntityID;
-    return this;
-}
-
-/** Getter for {@link FirePdu#firingEntityID}*/
-public EntityID getFiringEntityID()
-{
-    return firingEntityID; 
-}
-
-/** Setter for {@link FirePdu#targetEntityID}*/
-public FirePdu setTargetEntityID(EntityID pTargetEntityID)
-{
-    targetEntityID = pTargetEntityID;
-    return this;
-}
-
-/** Getter for {@link FirePdu#targetEntityID}*/
-public EntityID getTargetEntityID()
-{
-    return targetEntityID; 
-}
-
-/** Setter for {@link FirePdu#munitionExpendibleID}*/
-public FirePdu setMunitionExpendibleID(EntityID pMunitionExpendibleID)
-{
-    munitionExpendibleID = pMunitionExpendibleID;
-    return this;
-}
-
-/** Getter for {@link FirePdu#munitionExpendibleID}*/
-public EntityID getMunitionExpendibleID()
-{
-    return munitionExpendibleID; 
-}
-
-/** Setter for {@link FirePdu#eventID}*/
-public FirePdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link FirePdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link FirePdu#fireMissionIndex}*/
-public FirePdu setFireMissionIndex(int pFireMissionIndex)
-{
-    fireMissionIndex = pFireMissionIndex;
-    return this;
-}
-
-/** Getter for {@link FirePdu#fireMissionIndex}*/
-public int getFireMissionIndex()
-{
-    return fireMissionIndex; 
-}
-
-/** Setter for {@link FirePdu#locationInWorldCoordinates}*/
-public FirePdu setLocationInWorldCoordinates(Vector3Double pLocationInWorldCoordinates)
-{
-    locationInWorldCoordinates = pLocationInWorldCoordinates;
-    return this;
-}
-
-/** Getter for {@link FirePdu#locationInWorldCoordinates}*/
-public Vector3Double getLocationInWorldCoordinates()
-{
-    return locationInWorldCoordinates; 
-}
-
-/** Setter for {@link FirePdu#descriptor}*/
-public FirePdu setDescriptor(MunitionDescriptor pDescriptor)
-{
-    descriptor = pDescriptor;
-    return this;
-}
-
-/** Getter for {@link FirePdu#descriptor}*/
-public MunitionDescriptor getDescriptor()
-{
-    return descriptor; 
-}
-
-/** Setter for {@link FirePdu#velocity}*/
-public FirePdu setVelocity(Vector3Float pVelocity)
-{
-    velocity = pVelocity;
-    return this;
-}
-
-/** Getter for {@link FirePdu#velocity}*/
-public Vector3Float getVelocity()
-{
-    return velocity; 
-}
-
-/** Setter for {@link FirePdu#range}*/
-public FirePdu setRange(float pRange)
-{
-    range = pRange;
-    return this;
-}
-
-/** Getter for {@link FirePdu#range}*/
-public float getRange()
-{
-    return range; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       firingEntityID.marshal(dos);
-       targetEntityID.marshal(dos);
-       munitionExpendibleID.marshal(dos);
-       eventID.marshal(dos);
-       dos.writeInt(fireMissionIndex);
-       locationInWorldCoordinates.marshal(dos);
-       descriptor.marshal(dos);
-       velocity.marshal(dos);
-       dos.writeFloat(range);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += firingEntityID.unmarshal(dis);
-        uPosition += targetEntityID.unmarshal(dis);
-        uPosition += munitionExpendibleID.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        fireMissionIndex = dis.readInt();
-        uPosition += 4;
-        uPosition += locationInWorldCoordinates.unmarshal(dis);
-        uPosition += descriptor.unmarshal(dis);
-        uPosition += velocity.unmarshal(dis);
-        range = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   firingEntityID.marshal(buff);
-   targetEntityID.marshal(buff);
-   munitionExpendibleID.marshal(buff);
-   eventID.marshal(buff);
-   buff.putInt( (int)fireMissionIndex);
-   locationInWorldCoordinates.marshal(buff);
-   descriptor.marshal(buff);
-   velocity.marshal(buff);
-   buff.putFloat( (float)range);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    firingEntityID.unmarshal(buff);
-    targetEntityID.unmarshal(buff);
-    munitionExpendibleID.unmarshal(buff);
-    eventID.unmarshal(buff);
-    fireMissionIndex = buff.getInt();
-    locationInWorldCoordinates.unmarshal(buff);
-    descriptor.unmarshal(buff);
-    velocity.unmarshal(buff);
-    range = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final FirePdu rhs = (FirePdu)obj;
-
-     if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
-     if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
-     if( ! (munitionExpendibleID.equals( rhs.munitionExpendibleID) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (fireMissionIndex == rhs.fireMissionIndex)) ivarsEqual = false;
-     if( ! (locationInWorldCoordinates.equals( rhs.locationInWorldCoordinates) )) ivarsEqual = false;
-     if( ! (descriptor.equals( rhs.descriptor) )) ivarsEqual = false;
-     if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-     if( ! (range == rhs.range)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
-    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
-    sb.append(" munitionExpendibleID: ").append(munitionExpendibleID).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" fireMissionIndex: ").append(fireMissionIndex).append("\n");
-    sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
-    sb.append(" descriptor: ").append(descriptor).append("\n");
-    sb.append(" velocity: ").append(velocity).append("\n");
-    sb.append(" range: ").append(range).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FixedDatum.java b/src-generated/edu/nps/moves/dis7/FixedDatum.java
deleted file mode 100644
index 8fe34b3302cb0208e3709435e4b81b013dc6e1dd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/FixedDatum.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Fixed Datum Record. Section 6.2.38
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class FixedDatum extends Object implements Serializable
-{
-   /** ID of the fixed datum, an enumeration uid 66 */
-   protected VariableRecordType fixedDatumID = VariableRecordType.values()[0];
-
-   /** Value for the fixed datum */
-   protected int  fixedDatumValue;
-
-
-/** Constructor */
- public FixedDatum()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += fixedDatumID.getMarshalledSize();
-   marshalSize += 4;  // fixedDatumValue
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link FixedDatum#fixedDatumID}*/
-public FixedDatum setFixedDatumID(VariableRecordType pFixedDatumID)
-{
-    fixedDatumID = pFixedDatumID;
-    return this;
-}
-
-/** Getter for {@link FixedDatum#fixedDatumID}*/
-public VariableRecordType getFixedDatumID()
-{
-    return fixedDatumID; 
-}
-
-/** Setter for {@link FixedDatum#fixedDatumValue}*/
-public FixedDatum setFixedDatumValue(int pFixedDatumValue)
-{
-    fixedDatumValue = pFixedDatumValue;
-    return this;
-}
-
-/** Getter for {@link FixedDatum#fixedDatumValue}*/
-public int getFixedDatumValue()
-{
-    return fixedDatumValue; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       fixedDatumID.marshal(dos);
-       dos.writeInt(fixedDatumValue);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        fixedDatumID = VariableRecordType.unmarshalEnum(dis);
-        uPosition += fixedDatumID.getMarshalledSize();
-        fixedDatumValue = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   fixedDatumID.marshal(buff);
-   buff.putInt( (int)fixedDatumValue);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    fixedDatumID = VariableRecordType.unmarshalEnum(buff);
-    fixedDatumValue = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final FixedDatum rhs = (FixedDatum)obj;
-
-     if( ! (fixedDatumID == rhs.fixedDatumID)) ivarsEqual = false;
-     if( ! (fixedDatumValue == rhs.fixedDatumValue)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fixedDatumID: ").append(fixedDatumID).append("\n");
-    sb.append(" fixedDatumValue: ").append(fixedDatumValue).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
deleted file mode 100644
index 7be45b92304d970b286b6d27e3b4ac9145590e5a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Basic operational data for IFF. Section 6.2.39
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class FundamentalOperationalData extends Object implements Serializable
-{
-   /** system status, IEEE DIS 7 defined */
-   protected byte  systemStatus;
-
-   /** data field 1 */
-   protected byte  dataField1;
-
-   /** eight boolean fields */
-   protected byte  informationLayers;
-
-   /** enumeration */
-   protected byte  dataField2;
-
-   /** parameter, enumeration */
-   protected short  parameter1;
-
-   /** parameter, enumeration */
-   protected short  parameter2;
-
-   /** parameter, enumeration */
-   protected short  parameter3;
-
-   /** parameter, enumeration */
-   protected short  parameter4;
-
-   /** parameter, enumeration */
-   protected short  parameter5;
-
-   /** parameter, enumeration */
-   protected short  parameter6;
-
-
-/** Constructor */
- public FundamentalOperationalData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // systemStatus
-   marshalSize += 1;  // dataField1
-   marshalSize += 1;  // informationLayers
-   marshalSize += 1;  // dataField2
-   marshalSize += 2;  // parameter1
-   marshalSize += 2;  // parameter2
-   marshalSize += 2;  // parameter3
-   marshalSize += 2;  // parameter4
-   marshalSize += 2;  // parameter5
-   marshalSize += 2;  // parameter6
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link FundamentalOperationalData#systemStatus}*/
-public FundamentalOperationalData setSystemStatus(byte pSystemStatus)
-{
-    systemStatus = pSystemStatus;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#systemStatus}*/
-public byte getSystemStatus()
-{
-    return systemStatus; 
-}
-
-/** Setter for {@link FundamentalOperationalData#dataField1}*/
-public FundamentalOperationalData setDataField1(byte pDataField1)
-{
-    dataField1 = pDataField1;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#dataField1}*/
-public byte getDataField1()
-{
-    return dataField1; 
-}
-
-/** Setter for {@link FundamentalOperationalData#informationLayers}*/
-public FundamentalOperationalData setInformationLayers(byte pInformationLayers)
-{
-    informationLayers = pInformationLayers;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#informationLayers}*/
-public byte getInformationLayers()
-{
-    return informationLayers; 
-}
-
-/** Setter for {@link FundamentalOperationalData#dataField2}*/
-public FundamentalOperationalData setDataField2(byte pDataField2)
-{
-    dataField2 = pDataField2;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#dataField2}*/
-public byte getDataField2()
-{
-    return dataField2; 
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter1}*/
-public FundamentalOperationalData setParameter1(short pParameter1)
-{
-    parameter1 = pParameter1;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter1}*/
-public short getParameter1()
-{
-    return parameter1; 
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter2}*/
-public FundamentalOperationalData setParameter2(short pParameter2)
-{
-    parameter2 = pParameter2;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter2}*/
-public short getParameter2()
-{
-    return parameter2; 
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter3}*/
-public FundamentalOperationalData setParameter3(short pParameter3)
-{
-    parameter3 = pParameter3;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter3}*/
-public short getParameter3()
-{
-    return parameter3; 
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter4}*/
-public FundamentalOperationalData setParameter4(short pParameter4)
-{
-    parameter4 = pParameter4;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter4}*/
-public short getParameter4()
-{
-    return parameter4; 
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter5}*/
-public FundamentalOperationalData setParameter5(short pParameter5)
-{
-    parameter5 = pParameter5;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter5}*/
-public short getParameter5()
-{
-    return parameter5; 
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter6}*/
-public FundamentalOperationalData setParameter6(short pParameter6)
-{
-    parameter6 = pParameter6;
-    return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter6}*/
-public short getParameter6()
-{
-    return parameter6; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(systemStatus);
-       dos.writeByte(dataField1);
-       dos.writeByte(informationLayers);
-       dos.writeByte(dataField2);
-       dos.writeShort(parameter1);
-       dos.writeShort(parameter2);
-       dos.writeShort(parameter3);
-       dos.writeShort(parameter4);
-       dos.writeShort(parameter5);
-       dos.writeShort(parameter6);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        systemStatus = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        dataField1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        informationLayers = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        dataField2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        parameter1 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameter2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameter3 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameter4 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameter5 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        parameter6 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)systemStatus);
-   buff.put( (byte)dataField1);
-   buff.put( (byte)informationLayers);
-   buff.put( (byte)dataField2);
-   buff.putShort( (short)parameter1);
-   buff.putShort( (short)parameter2);
-   buff.putShort( (short)parameter3);
-   buff.putShort( (short)parameter4);
-   buff.putShort( (short)parameter5);
-   buff.putShort( (short)parameter6);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    systemStatus = (byte)(buff.get() & 0xFF);
-    dataField1 = (byte)(buff.get() & 0xFF);
-    informationLayers = (byte)(buff.get() & 0xFF);
-    dataField2 = (byte)(buff.get() & 0xFF);
-    parameter1 = (short)(buff.getShort() & 0xFFFF);
-    parameter2 = (short)(buff.getShort() & 0xFFFF);
-    parameter3 = (short)(buff.getShort() & 0xFFFF);
-    parameter4 = (short)(buff.getShort() & 0xFFFF);
-    parameter5 = (short)(buff.getShort() & 0xFFFF);
-    parameter6 = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final FundamentalOperationalData rhs = (FundamentalOperationalData)obj;
-
-     if( ! (systemStatus == rhs.systemStatus)) ivarsEqual = false;
-     if( ! (dataField1 == rhs.dataField1)) ivarsEqual = false;
-     if( ! (informationLayers == rhs.informationLayers)) ivarsEqual = false;
-     if( ! (dataField2 == rhs.dataField2)) ivarsEqual = false;
-     if( ! (parameter1 == rhs.parameter1)) ivarsEqual = false;
-     if( ! (parameter2 == rhs.parameter2)) ivarsEqual = false;
-     if( ! (parameter3 == rhs.parameter3)) ivarsEqual = false;
-     if( ! (parameter4 == rhs.parameter4)) ivarsEqual = false;
-     if( ! (parameter5 == rhs.parameter5)) ivarsEqual = false;
-     if( ! (parameter6 == rhs.parameter6)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" systemStatus: ").append(systemStatus).append("\n");
-    sb.append(" dataField1: ").append(dataField1).append("\n");
-    sb.append(" informationLayers: ").append(informationLayers).append("\n");
-    sb.append(" dataField2: ").append(dataField2).append("\n");
-    sb.append(" parameter1: ").append(parameter1).append("\n");
-    sb.append(" parameter2: ").append(parameter2).append("\n");
-    sb.append(" parameter3: ").append(parameter3).append("\n");
-    sb.append(" parameter4: ").append(parameter4).append("\n");
-    sb.append(" parameter5: ").append(parameter5).append("\n");
-    sb.append(" parameter6: ").append(parameter6).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
deleted file mode 100644
index 3fd9fa3465dc0bc149b7c196b856a2d0e41d23ef..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridAxisDescriptor extends Object implements Serializable
-{
-   /** coordinate of the grid origin or initial value */
-   protected double  domainInitialXi;
-
-   /** coordinate of the endpoint or final value */
-   protected double  domainFinalXi;
-
-   /** The number of grid points along the Xi domain axis for the enviornmental state data */
-   protected short  domainPointsXi;
-
-   /** interleaf factor along the domain axis. */
-   protected byte  interleafFactor;
-
-   /** type of grid axis uid 377 */
-   protected GridAxisDescriptorAxisType axisType = GridAxisDescriptorAxisType.values()[0];
-
-
-/** Constructor */
- public GridAxisDescriptor()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 8;  // domainInitialXi
-   marshalSize += 8;  // domainFinalXi
-   marshalSize += 2;  // domainPointsXi
-   marshalSize += 1;  // interleafFactor
-   marshalSize += axisType.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridAxisDescriptor#domainInitialXi}*/
-public GridAxisDescriptor setDomainInitialXi(double pDomainInitialXi)
-{
-    domainInitialXi = pDomainInitialXi;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#domainInitialXi}*/
-public double getDomainInitialXi()
-{
-    return domainInitialXi; 
-}
-
-/** Setter for {@link GridAxisDescriptor#domainFinalXi}*/
-public GridAxisDescriptor setDomainFinalXi(double pDomainFinalXi)
-{
-    domainFinalXi = pDomainFinalXi;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#domainFinalXi}*/
-public double getDomainFinalXi()
-{
-    return domainFinalXi; 
-}
-
-/** Setter for {@link GridAxisDescriptor#domainPointsXi}*/
-public GridAxisDescriptor setDomainPointsXi(short pDomainPointsXi)
-{
-    domainPointsXi = pDomainPointsXi;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#domainPointsXi}*/
-public short getDomainPointsXi()
-{
-    return domainPointsXi; 
-}
-
-/** Setter for {@link GridAxisDescriptor#interleafFactor}*/
-public GridAxisDescriptor setInterleafFactor(byte pInterleafFactor)
-{
-    interleafFactor = pInterleafFactor;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#interleafFactor}*/
-public byte getInterleafFactor()
-{
-    return interleafFactor; 
-}
-
-/** Setter for {@link GridAxisDescriptor#axisType}*/
-public GridAxisDescriptor setAxisType(GridAxisDescriptorAxisType pAxisType)
-{
-    axisType = pAxisType;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#axisType}*/
-public GridAxisDescriptorAxisType getAxisType()
-{
-    return axisType; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeDouble(domainInitialXi);
-       dos.writeDouble(domainFinalXi);
-       dos.writeShort(domainPointsXi);
-       dos.writeByte(interleafFactor);
-       axisType.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        domainInitialXi = dis.readDouble();
-        uPosition += 4;
-        domainFinalXi = dis.readDouble();
-        uPosition += 4;
-        domainPointsXi = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        interleafFactor = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        axisType = GridAxisDescriptorAxisType.unmarshalEnum(dis);
-        uPosition += axisType.getMarshalledSize();
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putDouble( (double)domainInitialXi);
-   buff.putDouble( (double)domainFinalXi);
-   buff.putShort( (short)domainPointsXi);
-   buff.put( (byte)interleafFactor);
-   axisType.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    domainInitialXi = buff.getDouble();
-    domainFinalXi = buff.getDouble();
-    domainPointsXi = (short)(buff.getShort() & 0xFFFF);
-    interleafFactor = (byte)(buff.get() & 0xFF);
-    axisType = GridAxisDescriptorAxisType.unmarshalEnum(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridAxisDescriptor rhs = (GridAxisDescriptor)obj;
-
-     if( ! (domainInitialXi == rhs.domainInitialXi)) ivarsEqual = false;
-     if( ! (domainFinalXi == rhs.domainFinalXi)) ivarsEqual = false;
-     if( ! (domainPointsXi == rhs.domainPointsXi)) ivarsEqual = false;
-     if( ! (interleafFactor == rhs.interleafFactor)) ivarsEqual = false;
-     if( ! (axisType == rhs.axisType)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" domainInitialXi: ").append(domainInitialXi).append("\n");
-    sb.append(" domainFinalXi: ").append(domainFinalXi).append("\n");
-    sb.append(" domainPointsXi: ").append(domainPointsXi).append("\n");
-    sb.append(" interleafFactor: ").append(interleafFactor).append("\n");
-    sb.append(" axisType: ").append(axisType).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
deleted file mode 100644
index 1ab420c18b0e98dc71da9f81956d18d31f0840a9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Grid axis record for fixed data. Section 6.2.41
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridAxisDescriptorFixed extends GridAxisDescriptor implements Serializable
-{
-   /** Number of grid locations along Xi axis */
-   protected short  numberOfPointsOnXiAxis;
-
-   /** initial grid point for the current pdu */
-   protected short  initialIndex;
-
-
-/** Constructor */
- public GridAxisDescriptorFixed()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 2;  // numberOfPointsOnXiAxis
-   marshalSize += 2;  // initialIndex
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridAxisDescriptorFixed#numberOfPointsOnXiAxis}*/
-public GridAxisDescriptorFixed setNumberOfPointsOnXiAxis(short pNumberOfPointsOnXiAxis)
-{
-    numberOfPointsOnXiAxis = pNumberOfPointsOnXiAxis;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorFixed#numberOfPointsOnXiAxis}*/
-public short getNumberOfPointsOnXiAxis()
-{
-    return numberOfPointsOnXiAxis; 
-}
-
-/** Setter for {@link GridAxisDescriptorFixed#initialIndex}*/
-public GridAxisDescriptorFixed setInitialIndex(short pInitialIndex)
-{
-    initialIndex = pInitialIndex;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorFixed#initialIndex}*/
-public short getInitialIndex()
-{
-    return initialIndex; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeShort(numberOfPointsOnXiAxis);
-       dos.writeShort(initialIndex);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        numberOfPointsOnXiAxis = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        initialIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putShort( (short)numberOfPointsOnXiAxis);
-   buff.putShort( (short)initialIndex);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    numberOfPointsOnXiAxis = (short)(buff.getShort() & 0xFFFF);
-    initialIndex = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridAxisDescriptorFixed rhs = (GridAxisDescriptorFixed)obj;
-
-     if( ! (numberOfPointsOnXiAxis == rhs.numberOfPointsOnXiAxis)) ivarsEqual = false;
-     if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
-    sb.append(" initialIndex: ").append(initialIndex).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
deleted file mode 100644
index 5da3a13623cd10a4db9b2389aaf93eab5c3b6617..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Grid axis descriptor fo variable spacing axis data.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridAxisDescriptorVariable extends GridAxisDescriptor implements Serializable
-{
-   /** Number of grid locations along Xi axis */
-   protected short  numberOfPointsOnXiAxis;
-
-   /** initial grid point for the current pdu */
-   protected short  initialIndex;
-
-   /** value that linearly scales the coordinates of the grid locations for the xi axis */
-   protected double  coordinateScaleXi;
-
-   /** The constant offset value that shall be applied to the grid locations for the xi axis */
-   protected double  coordinateOffsetXi = (double)0.0;
-
-   /** list of coordinates */
-   protected short[]  xiValues = new short[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public GridAxisDescriptorVariable()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 2;  // numberOfPointsOnXiAxis
-   marshalSize += 2;  // initialIndex
-   marshalSize += 8;  // coordinateScaleXi
-   marshalSize += 8;  // coordinateOffsetXi
-   marshalSize += xiValues.length * 2;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridAxisDescriptorVariable#numberOfPointsOnXiAxis}*/
-public GridAxisDescriptorVariable setNumberOfPointsOnXiAxis(short pNumberOfPointsOnXiAxis)
-{
-    numberOfPointsOnXiAxis = pNumberOfPointsOnXiAxis;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#numberOfPointsOnXiAxis}*/
-public short getNumberOfPointsOnXiAxis()
-{
-    return numberOfPointsOnXiAxis; 
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#initialIndex}*/
-public GridAxisDescriptorVariable setInitialIndex(short pInitialIndex)
-{
-    initialIndex = pInitialIndex;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#initialIndex}*/
-public short getInitialIndex()
-{
-    return initialIndex; 
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#coordinateScaleXi}*/
-public GridAxisDescriptorVariable setCoordinateScaleXi(double pCoordinateScaleXi)
-{
-    coordinateScaleXi = pCoordinateScaleXi;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#coordinateScaleXi}*/
-public double getCoordinateScaleXi()
-{
-    return coordinateScaleXi; 
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#coordinateOffsetXi}*/
-public GridAxisDescriptorVariable setCoordinateOffsetXi(double pCoordinateOffsetXi)
-{
-    coordinateOffsetXi = pCoordinateOffsetXi;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#coordinateOffsetXi}*/
-public double getCoordinateOffsetXi()
-{
-    return coordinateOffsetXi; 
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#xiValues}*/
-public GridAxisDescriptorVariable setXiValues(short[] pXiValues)
-{
-    xiValues = pXiValues;
-    return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#xiValues}*/
-public short[] getXiValues()
-{
-    return xiValues; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeShort(numberOfPointsOnXiAxis);
-       dos.writeShort(initialIndex);
-       dos.writeDouble(coordinateScaleXi);
-       dos.writeDouble(coordinateOffsetXi);
-
-       for(int idx = 0; idx < xiValues.length; idx++)
-           dos.writeShort(xiValues[idx]);
-
-       padding = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        numberOfPointsOnXiAxis = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        initialIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        coordinateScaleXi = dis.readDouble();
-        uPosition += 4;
-        coordinateOffsetXi = dis.readDouble();
-        uPosition += 4;
-        for(int idx = 0; idx < xiValues.length; idx++)
-            xiValues[idx] = dis.readShort();
-        uPosition += (xiValues.length * 2);
-        padding = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putShort( (short)numberOfPointsOnXiAxis);
-   buff.putShort( (short)initialIndex);
-   buff.putDouble( (double)coordinateScaleXi);
-   buff.putDouble( (double)coordinateOffsetXi);
-
-   for(int idx = 0; idx < xiValues.length; idx++)
-       buff.putShort((short)xiValues[idx]);
-
-   padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    numberOfPointsOnXiAxis = (short)(buff.getShort() & 0xFFFF);
-    initialIndex = (short)(buff.getShort() & 0xFFFF);
-    coordinateScaleXi = buff.getDouble();
-    coordinateOffsetXi = buff.getDouble();
-    for(int idx = 0; idx < xiValues.length; idx++)
-        xiValues[idx] = buff.getShort();
-    padding = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridAxisDescriptorVariable rhs = (GridAxisDescriptorVariable)obj;
-
-     if( ! (numberOfPointsOnXiAxis == rhs.numberOfPointsOnXiAxis)) ivarsEqual = false;
-     if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
-     if( ! (coordinateScaleXi == rhs.coordinateScaleXi)) ivarsEqual = false;
-     if( ! (coordinateOffsetXi == rhs.coordinateOffsetXi)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(xiValues[idx] == rhs.xiValues[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
-    sb.append(" initialIndex: ").append(initialIndex).append("\n");
-    sb.append(" coordinateScaleXi: ").append(coordinateScaleXi).append("\n");
-    sb.append(" coordinateOffsetXi: ").append(coordinateOffsetXi).append("\n");
-    sb.append(" xiValues: ").append("\n");
-    sb.append(Arrays.toString(xiValues)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridData.java b/src-generated/edu/nps/moves/dis7/GridData.java
deleted file mode 100644
index 362e7e8ea618f1e569d97588dbb61ae310716707..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridData.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 68
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridData extends Object implements Serializable
-{
-   /**  uid 246 */
-   protected GriddedDataSampleType sampleType = GriddedDataSampleType.values()[0];
-
-   /**  uid 247 */
-   protected GriddedDataDataRepresentation dataRepresentation = GriddedDataDataRepresentation.values()[0];
-
-
-/** Constructor */
- public GridData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += sampleType.getMarshalledSize();
-   marshalSize += dataRepresentation.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridData#sampleType}*/
-public GridData setSampleType(GriddedDataSampleType pSampleType)
-{
-    sampleType = pSampleType;
-    return this;
-}
-
-/** Getter for {@link GridData#sampleType}*/
-public GriddedDataSampleType getSampleType()
-{
-    return sampleType; 
-}
-
-/** Setter for {@link GridData#dataRepresentation}*/
-public GridData setDataRepresentation(GriddedDataDataRepresentation pDataRepresentation)
-{
-    dataRepresentation = pDataRepresentation;
-    return this;
-}
-
-/** Getter for {@link GridData#dataRepresentation}*/
-public GriddedDataDataRepresentation getDataRepresentation()
-{
-    return dataRepresentation; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       sampleType.marshal(dos);
-       dataRepresentation.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        sampleType = GriddedDataSampleType.unmarshalEnum(dis);
-        uPosition += sampleType.getMarshalledSize();
-        dataRepresentation = GriddedDataDataRepresentation.unmarshalEnum(dis);
-        uPosition += dataRepresentation.getMarshalledSize();
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   sampleType.marshal(buff);
-   dataRepresentation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    sampleType = GriddedDataSampleType.unmarshalEnum(buff);
-    dataRepresentation = GriddedDataDataRepresentation.unmarshalEnum(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridData rhs = (GridData)obj;
-
-     if( ! (sampleType == rhs.sampleType)) ivarsEqual = false;
-     if( ! (dataRepresentation == rhs.dataRepresentation)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" sampleType: ").append(sampleType).append("\n");
-    sb.append(" dataRepresentation: ").append(dataRepresentation).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType0.java b/src-generated/edu/nps/moves/dis7/GridDataType0.java
deleted file mode 100644
index e72793e8f3879a9082e71c1e0d3863e1444f423b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridDataType0.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 68
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridDataType0 extends GridData implements Serializable
-{
-   protected short  numberOfBytes;
-
-   protected byte[]  dataValues = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 16-bit boundary
-
-
-/** Constructor */
- public GridDataType0()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 2;  // numberOfBytes
-   marshalSize += dataValues.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridDataType0#dataValues}*/
-public GridDataType0 setDataValues(byte[] pDataValues)
-{
-    dataValues = pDataValues;
-    return this;
-}
-
-/** Getter for {@link GridDataType0#dataValues}*/
-public byte[] getDataValues()
-{
-    return dataValues; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeShort(dataValues.length);
-
-       for(int idx = 0; idx < dataValues.length; idx++)
-           dos.writeByte(dataValues[idx]);
-
-       padding = new byte[Align.to16bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        numberOfBytes = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < dataValues.length; idx++)
-            dataValues[idx] = dis.readByte();
-        uPosition += (dataValues.length * 1);
-        padding = new byte[Align.from16bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putShort( (short)dataValues.length);
-
-   for(int idx = 0; idx < dataValues.length; idx++)
-       buff.put((byte)dataValues[idx]);
-
-   padding = new byte[Align.to16bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    numberOfBytes = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < dataValues.length; idx++)
-        dataValues[idx] = buff.get();
-    padding = new byte[Align.from16bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridDataType0 rhs = (GridDataType0)obj;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" dataValues: ").append("\n");
-    sb.append(Arrays.toString(dataValues)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType1.java b/src-generated/edu/nps/moves/dis7/GridDataType1.java
deleted file mode 100644
index c5e759305d793e77c688ee17db9424b6db2cbd33..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridDataType1.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 69
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridDataType1 extends GridData implements Serializable
-{
-   protected float  fieldScale;
-
-   protected float  fieldOffset;
-
-   protected short  numberOfValues;
-
-   protected short[]  dataValues = new short[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 32-bit boundary
-
-
-/** Constructor */
- public GridDataType1()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // fieldScale
-   marshalSize += 4;  // fieldOffset
-   marshalSize += 2;  // numberOfValues
-   marshalSize += dataValues.length * 2;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridDataType1#fieldScale}*/
-public GridDataType1 setFieldScale(float pFieldScale)
-{
-    fieldScale = pFieldScale;
-    return this;
-}
-
-/** Getter for {@link GridDataType1#fieldScale}*/
-public float getFieldScale()
-{
-    return fieldScale; 
-}
-
-/** Setter for {@link GridDataType1#fieldOffset}*/
-public GridDataType1 setFieldOffset(float pFieldOffset)
-{
-    fieldOffset = pFieldOffset;
-    return this;
-}
-
-/** Getter for {@link GridDataType1#fieldOffset}*/
-public float getFieldOffset()
-{
-    return fieldOffset; 
-}
-
-/** Setter for {@link GridDataType1#dataValues}*/
-public GridDataType1 setDataValues(short[] pDataValues)
-{
-    dataValues = pDataValues;
-    return this;
-}
-
-/** Getter for {@link GridDataType1#dataValues}*/
-public short[] getDataValues()
-{
-    return dataValues; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeFloat(fieldScale);
-       dos.writeFloat(fieldOffset);
-       dos.writeShort(dataValues.length);
-
-       for(int idx = 0; idx < dataValues.length; idx++)
-           dos.writeShort(dataValues[idx]);
-
-       padding = new byte[Align.to32bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        fieldScale = dis.readFloat();
-        uPosition += 4;
-        fieldOffset = dis.readFloat();
-        uPosition += 4;
-        numberOfValues = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < dataValues.length; idx++)
-            dataValues[idx] = dis.readShort();
-        uPosition += (dataValues.length * 2);
-        padding = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putFloat( (float)fieldScale);
-   buff.putFloat( (float)fieldOffset);
-   buff.putShort( (short)dataValues.length);
-
-   for(int idx = 0; idx < dataValues.length; idx++)
-       buff.putShort((short)dataValues[idx]);
-
-   padding = new byte[Align.to32bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    fieldScale = buff.getFloat();
-    fieldOffset = buff.getFloat();
-    numberOfValues = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < dataValues.length; idx++)
-        dataValues[idx] = buff.getShort();
-    padding = new byte[Align.from32bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridDataType1 rhs = (GridDataType1)obj;
-
-     if( ! (fieldScale == rhs.fieldScale)) ivarsEqual = false;
-     if( ! (fieldOffset == rhs.fieldOffset)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fieldScale: ").append(fieldScale).append("\n");
-    sb.append(" fieldOffset: ").append(fieldOffset).append("\n");
-    sb.append(" dataValues: ").append("\n");
-    sb.append(Arrays.toString(dataValues)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType2.java b/src-generated/edu/nps/moves/dis7/GridDataType2.java
deleted file mode 100644
index 05cc3e2aaf22c458e1ac48dcd10574b4739d78f8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GridDataType2.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 70
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GridDataType2 extends GridData implements Serializable
-{
-   protected short  numberOfValues;
-
-   protected short  padding;
-
-   protected float[]  dataValues = new float[0]; 
-
-
-/** Constructor */
- public GridDataType2()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 2;  // numberOfValues
-   marshalSize += 2;  // padding
-   marshalSize += dataValues.length * 4;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GridDataType2#padding}*/
-public GridDataType2 setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link GridDataType2#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link GridDataType2#dataValues}*/
-public GridDataType2 setDataValues(float[] pDataValues)
-{
-    dataValues = pDataValues;
-    return this;
-}
-
-/** Getter for {@link GridDataType2#dataValues}*/
-public float[] getDataValues()
-{
-    return dataValues; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeShort(dataValues.length);
-       dos.writeShort(padding);
-
-       for(int idx = 0; idx < dataValues.length; idx++)
-           dos.writeFloat(dataValues[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        numberOfValues = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < dataValues.length; idx++)
-            dataValues[idx] = dis.readFloat();
-        uPosition += (dataValues.length * 4);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putShort( (short)dataValues.length);
-   buff.putShort( (short)padding);
-
-   for(int idx = 0; idx < dataValues.length; idx++)
-       buff.putFloat((float)dataValues[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    numberOfValues = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < dataValues.length; idx++)
-        dataValues[idx] = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GridDataType2 rhs = (GridDataType2)obj;
-
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" dataValues: ").append("\n");
-    sb.append(Arrays.toString(dataValues)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
deleted file mode 100644
index 72699ab763333e4f0bb44a24f62e5cae88e8a746..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.3 Used to communicate information about global, spatially varying environmental effects.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GriddedDataPdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
-   /** environmental simulation application ID */
-   protected SimulationIdentifier  environmentalSimulationApplicationID = new SimulationIdentifier(); 
-
-   /** unique identifier for each piece of environmental data */
-   protected short  fieldNumber;
-
-   /** sequence number for the total set of PDUS used to transmit the data */
-   protected short  pduNumber;
-
-   /** Total number of PDUS used to transmit the data */
-   protected short  pduTotal;
-
-   /** coordinate system of the grid uid 244 */
-   protected GriddedDataCoordinateSystem coordinateSystem = GriddedDataCoordinateSystem.values()[0];
-
-   /** number of grid axes for the environmental data */
-   protected byte  numberOfGridAxes;
-
-   /** are domain grid axes identidal to those of the priveious domain update? uid 245 */
-   protected GriddedDataConstantGrid constantGrid = GriddedDataConstantGrid.values()[0];
-
-   /** type of environment */
-   protected EntityType  environmentType = new EntityType(); 
-
-   /** orientation of the data grid */
-   protected EulerAngles  orientation = new EulerAngles(); 
-
-   /** valid time of the enviormental data sample, 64 bit unsigned int */
-   protected ClockTime  sampleTime = new ClockTime(); 
-
-   /** total number of all data values for all pdus for an environmental sample */
-   protected int  totalValues;
-
-   /** total number of data values at each grid point. */
-   protected byte  vectorDimension;
-
-   /** padding */
-   protected byte  padding1;
-
-   /** padding */
-   protected short  padding2;
-
-   /**  */
-   protected List< GridAxisDescriptor > gridAxisDescriptors = new ArrayList< GridAxisDescriptor >();
- 
-   /**  */
-   protected List< GridData > gridDataRecords = new ArrayList< GridData >();
- 
-
-/** Constructor */
- public GriddedDataPdu()
- {
-    setPduType( DISPDUType.GRIDDED_DATA );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += environmentalSimulationApplicationID.getMarshalledSize();
-   marshalSize += 2;  // fieldNumber
-   marshalSize += 2;  // pduNumber
-   marshalSize += 2;  // pduTotal
-   marshalSize += coordinateSystem.getMarshalledSize();
-   marshalSize += 1;  // numberOfGridAxes
-   marshalSize += constantGrid.getMarshalledSize();
-   marshalSize += environmentType.getMarshalledSize();
-   marshalSize += orientation.getMarshalledSize();
-   marshalSize += sampleTime.getMarshalledSize();
-   marshalSize += 4;  // totalValues
-   marshalSize += 1;  // vectorDimension
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-   for(int idx=0; idx < gridAxisDescriptors.size(); idx++)
-   {
-        GridAxisDescriptor listElement = gridAxisDescriptors.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < gridDataRecords.size(); idx++)
-   {
-        GridData listElement = gridDataRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GriddedDataPdu#environmentalSimulationApplicationID}*/
-public GriddedDataPdu setEnvironmentalSimulationApplicationID(SimulationIdentifier pEnvironmentalSimulationApplicationID)
-{
-    environmentalSimulationApplicationID = pEnvironmentalSimulationApplicationID;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#environmentalSimulationApplicationID}*/
-public SimulationIdentifier getEnvironmentalSimulationApplicationID()
-{
-    return environmentalSimulationApplicationID; 
-}
-
-/** Setter for {@link GriddedDataPdu#fieldNumber}*/
-public GriddedDataPdu setFieldNumber(short pFieldNumber)
-{
-    fieldNumber = pFieldNumber;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#fieldNumber}*/
-public short getFieldNumber()
-{
-    return fieldNumber; 
-}
-
-/** Setter for {@link GriddedDataPdu#pduNumber}*/
-public GriddedDataPdu setPduNumber(short pPduNumber)
-{
-    pduNumber = pPduNumber;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#pduNumber}*/
-public short getPduNumber()
-{
-    return pduNumber; 
-}
-
-/** Setter for {@link GriddedDataPdu#pduTotal}*/
-public GriddedDataPdu setPduTotal(short pPduTotal)
-{
-    pduTotal = pPduTotal;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#pduTotal}*/
-public short getPduTotal()
-{
-    return pduTotal; 
-}
-
-/** Setter for {@link GriddedDataPdu#coordinateSystem}*/
-public GriddedDataPdu setCoordinateSystem(GriddedDataCoordinateSystem pCoordinateSystem)
-{
-    coordinateSystem = pCoordinateSystem;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#coordinateSystem}*/
-public GriddedDataCoordinateSystem getCoordinateSystem()
-{
-    return coordinateSystem; 
-}
-
-/** Setter for {@link GriddedDataPdu#constantGrid}*/
-public GriddedDataPdu setConstantGrid(GriddedDataConstantGrid pConstantGrid)
-{
-    constantGrid = pConstantGrid;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#constantGrid}*/
-public GriddedDataConstantGrid getConstantGrid()
-{
-    return constantGrid; 
-}
-
-/** Setter for {@link GriddedDataPdu#environmentType}*/
-public GriddedDataPdu setEnvironmentType(EntityType pEnvironmentType)
-{
-    environmentType = pEnvironmentType;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#environmentType}*/
-public EntityType getEnvironmentType()
-{
-    return environmentType; 
-}
-
-/** Setter for {@link GriddedDataPdu#orientation}*/
-public GriddedDataPdu setOrientation(EulerAngles pOrientation)
-{
-    orientation = pOrientation;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#orientation}*/
-public EulerAngles getOrientation()
-{
-    return orientation; 
-}
-
-/** Setter for {@link GriddedDataPdu#sampleTime}*/
-public GriddedDataPdu setSampleTime(ClockTime pSampleTime)
-{
-    sampleTime = pSampleTime;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#sampleTime}*/
-public ClockTime getSampleTime()
-{
-    return sampleTime; 
-}
-
-/** Setter for {@link GriddedDataPdu#totalValues}*/
-public GriddedDataPdu setTotalValues(int pTotalValues)
-{
-    totalValues = pTotalValues;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#totalValues}*/
-public int getTotalValues()
-{
-    return totalValues; 
-}
-
-/** Setter for {@link GriddedDataPdu#vectorDimension}*/
-public GriddedDataPdu setVectorDimension(byte pVectorDimension)
-{
-    vectorDimension = pVectorDimension;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#vectorDimension}*/
-public byte getVectorDimension()
-{
-    return vectorDimension; 
-}
-
-/** Setter for {@link GriddedDataPdu#padding1}*/
-public GriddedDataPdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link GriddedDataPdu#padding2}*/
-public GriddedDataPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link GriddedDataPdu#gridAxisDescriptors}*/
-public GriddedDataPdu setGridAxisDescriptors(List<GridAxisDescriptor> pGridAxisDescriptors)
-{
-    gridAxisDescriptors = pGridAxisDescriptors;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#gridAxisDescriptors}*/
-public List<GridAxisDescriptor> getGridAxisDescriptors()
-{
-    return gridAxisDescriptors; 
-}
-
-/** Setter for {@link GriddedDataPdu#gridDataRecords}*/
-public GriddedDataPdu setGridDataRecords(List<GridData> pGridDataRecords)
-{
-    gridDataRecords = pGridDataRecords;
-    return this;
-}
-
-/** Getter for {@link GriddedDataPdu#gridDataRecords}*/
-public List<GridData> getGridDataRecords()
-{
-    return gridDataRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       environmentalSimulationApplicationID.marshal(dos);
-       dos.writeShort(fieldNumber);
-       dos.writeShort(pduNumber);
-       dos.writeShort(pduTotal);
-       coordinateSystem.marshal(dos);
-       dos.writeByte(gridDataRecords.size());
-       constantGrid.marshal(dos);
-       environmentType.marshal(dos);
-       orientation.marshal(dos);
-       sampleTime.marshal(dos);
-       dos.writeInt(totalValues);
-       dos.writeByte(vectorDimension);
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-
-       for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
-       {
-            GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
-            aGridAxisDescriptor.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < gridDataRecords.size(); idx++)
-       {
-            GridData aGridData = gridDataRecords.get(idx);
-            aGridData.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += environmentalSimulationApplicationID.unmarshal(dis);
-        fieldNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        pduNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        pduTotal = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        coordinateSystem = GriddedDataCoordinateSystem.unmarshalEnum(dis);
-        uPosition += coordinateSystem.getMarshalledSize();
-        numberOfGridAxes = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        constantGrid = GriddedDataConstantGrid.unmarshalEnum(dis);
-        uPosition += constantGrid.getMarshalledSize();
-        uPosition += environmentType.unmarshal(dis);
-        uPosition += orientation.unmarshal(dis);
-        uPosition += sampleTime.unmarshal(dis);
-        totalValues = dis.readInt();
-        uPosition += 4;
-        vectorDimension = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfGridAxes; idx++)
-        {
-            GridAxisDescriptor anX = new GridAxisDescriptor();
-            uPosition += anX.unmarshal(dis);
-            gridAxisDescriptors.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfGridAxes; idx++)
-        {
-            GridData anX = new GridData();
-            uPosition += anX.unmarshal(dis);
-            gridDataRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   environmentalSimulationApplicationID.marshal(buff);
-   buff.putShort( (short)fieldNumber);
-   buff.putShort( (short)pduNumber);
-   buff.putShort( (short)pduTotal);
-   coordinateSystem.marshal(buff);
-   buff.put( (byte)gridDataRecords.size());
-   constantGrid.marshal(buff);
-   environmentType.marshal(buff);
-   orientation.marshal(buff);
-   sampleTime.marshal(buff);
-   buff.putInt( (int)totalValues);
-   buff.put( (byte)vectorDimension);
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-
-   for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
-   {
-        GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
-        aGridAxisDescriptor.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < gridDataRecords.size(); idx++)
-   {
-        GridData aGridData = gridDataRecords.get(idx);
-        aGridData.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    environmentalSimulationApplicationID.unmarshal(buff);
-    fieldNumber = (short)(buff.getShort() & 0xFFFF);
-    pduNumber = (short)(buff.getShort() & 0xFFFF);
-    pduTotal = (short)(buff.getShort() & 0xFFFF);
-    coordinateSystem = GriddedDataCoordinateSystem.unmarshalEnum(buff);
-    numberOfGridAxes = (byte)(buff.get() & 0xFF);
-    constantGrid = GriddedDataConstantGrid.unmarshalEnum(buff);
-    environmentType.unmarshal(buff);
-    orientation.unmarshal(buff);
-    sampleTime.unmarshal(buff);
-    totalValues = buff.getInt();
-    vectorDimension = (byte)(buff.get() & 0xFF);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfGridAxes; idx++)
-    {
-    GridAxisDescriptor anX = new GridAxisDescriptor();
-    anX.unmarshal(buff);
-    gridAxisDescriptors.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfGridAxes; idx++)
-    {
-    GridData anX = new GridData();
-    anX.unmarshal(buff);
-    gridDataRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GriddedDataPdu rhs = (GriddedDataPdu)obj;
-
-     if( ! (environmentalSimulationApplicationID.equals( rhs.environmentalSimulationApplicationID) )) ivarsEqual = false;
-     if( ! (fieldNumber == rhs.fieldNumber)) ivarsEqual = false;
-     if( ! (pduNumber == rhs.pduNumber)) ivarsEqual = false;
-     if( ! (pduTotal == rhs.pduTotal)) ivarsEqual = false;
-     if( ! (coordinateSystem == rhs.coordinateSystem)) ivarsEqual = false;
-     if( ! (constantGrid == rhs.constantGrid)) ivarsEqual = false;
-     if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
-     if( ! (orientation.equals( rhs.orientation) )) ivarsEqual = false;
-     if( ! (sampleTime.equals( rhs.sampleTime) )) ivarsEqual = false;
-     if( ! (totalValues == rhs.totalValues)) ivarsEqual = false;
-     if( ! (vectorDimension == rhs.vectorDimension)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
-        if( ! ( gridAxisDescriptors.get(idx).equals(rhs.gridAxisDescriptors.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < gridDataRecords.size(); idx++)
-        if( ! ( gridDataRecords.get(idx).equals(rhs.gridDataRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" environmentalSimulationApplicationID: ").append(environmentalSimulationApplicationID).append("\n");
-    sb.append(" fieldNumber: ").append(fieldNumber).append("\n");
-    sb.append(" pduNumber: ").append(pduNumber).append("\n");
-    sb.append(" pduTotal: ").append(pduTotal).append("\n");
-    sb.append(" coordinateSystem: ").append(coordinateSystem).append("\n");
-    sb.append(" constantGrid: ").append(constantGrid).append("\n");
-    sb.append(" environmentType: ").append(environmentType).append("\n");
-    sb.append(" orientation: ").append(orientation).append("\n");
-    sb.append(" sampleTime: ").append(sampleTime).append("\n");
-    sb.append(" totalValues: ").append(totalValues).append("\n");
-    sb.append(" vectorDimension: ").append(vectorDimension).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" gridAxisDescriptors: ").append("\n");
-    gridAxisDescriptors.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" gridDataRecords: ").append("\n");
-    gridDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GroupID.java b/src-generated/edu/nps/moves/dis7/GroupID.java
deleted file mode 100644
index b49e41f4a425253d5a2d2d630035ce1f527516ed..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/GroupID.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class GroupID extends Object implements Serializable
-{
-   /** Simulation address (site and application number) */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /** group number */
-   protected short  groupNumber;
-
-
-/** Constructor */
- public GroupID()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // groupNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link GroupID#simulationAddress}*/
-public GroupID setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link GroupID#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link GroupID#groupNumber}*/
-public GroupID setGroupNumber(short pGroupNumber)
-{
-    groupNumber = pGroupNumber;
-    return this;
-}
-
-/** Getter for {@link GroupID#groupNumber}*/
-public short getGroupNumber()
-{
-    return groupNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(groupNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        groupNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)groupNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    groupNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final GroupID rhs = (GroupID)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" groupNumber: ").append(groupNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFData.java b/src-generated/edu/nps/moves/dis7/IFFData.java
deleted file mode 100644
index 51bb97f42df52e34c63eb8e01b28d762d049d6bc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IFFData.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * repeating element in IFF Data specification record
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IFFData extends Object implements Serializable
-{
-   /** enumeration for type of record uid 66 */
-   protected VariableRecordType recordType = VariableRecordType.values()[0];
-
-   /** length of record, including padding */
-   protected short  recordLength;
-
-   protected byte[]  recordSpecificFields = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 32-bit boundary
-
-
-/** Constructor */
- public IFFData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 2;  // recordLength
-   marshalSize += recordSpecificFields.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IFFData#recordType}*/
-public IFFData setRecordType(VariableRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link IFFData#recordType}*/
-public VariableRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link IFFData#recordLength}*/
-public IFFData setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link IFFData#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link IFFData#recordSpecificFields}*/
-public IFFData setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
-    recordSpecificFields = pRecordSpecificFields;
-    return this;
-}
-
-/** Getter for {@link IFFData#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
-{
-    return recordSpecificFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeShort(recordLength);
-
-       for(int idx = 0; idx < recordSpecificFields.length; idx++)
-           dos.writeByte(recordSpecificFields[idx]);
-
-       padding = new byte[Align.to32bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < recordSpecificFields.length; idx++)
-            recordSpecificFields[idx] = dis.readByte();
-        uPosition += (recordSpecificFields.length * 1);
-        padding = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   buff.putShort( (short)recordLength);
-
-   for(int idx = 0; idx < recordSpecificFields.length; idx++)
-       buff.put((byte)recordSpecificFields[idx]);
-
-   padding = new byte[Align.to32bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableRecordType.unmarshalEnum(buff);
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < recordSpecificFields.length; idx++)
-        recordSpecificFields[idx] = buff.get();
-    padding = new byte[Align.from32bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IFFData rhs = (IFFData)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" recordSpecificFields: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
deleted file mode 100644
index a1ef9df2ebadb89102b090ab906bb6027902ba04..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Fundamental IFF atc data. Section 6.2.45
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IFFFundamentalParameterData extends Object implements Serializable
-{
-   /** ERP */
-   protected float  erp;
-
-   /** frequency */
-   protected float  frequency;
-
-   /** pgrf */
-   protected float  pgrf;
-
-   /** Pulse width */
-   protected float  pulseWidth;
-
-   /** Burst length */
-   protected int  burstLength;
-
-   /** Applicable modes enumeration uid 339 */
-   protected IFFApplicableModes applicableModes = IFFApplicableModes.values()[0];
-
-   /** System-specific data */
-   protected byte[]  systemSpecificData = new byte[3]; 
-
-
-/** Constructor */
- public IFFFundamentalParameterData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // erp
-   marshalSize += 4;  // frequency
-   marshalSize += 4;  // pgrf
-   marshalSize += 4;  // pulseWidth
-   marshalSize += 4;  // burstLength
-   marshalSize += applicableModes.getMarshalledSize();
-   marshalSize += systemSpecificData.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IFFFundamentalParameterData#erp}*/
-public IFFFundamentalParameterData setErp(float pErp)
-{
-    erp = pErp;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#erp}*/
-public float getErp()
-{
-    return erp; 
-}
-
-/** Setter for {@link IFFFundamentalParameterData#frequency}*/
-public IFFFundamentalParameterData setFrequency(float pFrequency)
-{
-    frequency = pFrequency;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#frequency}*/
-public float getFrequency()
-{
-    return frequency; 
-}
-
-/** Setter for {@link IFFFundamentalParameterData#pgrf}*/
-public IFFFundamentalParameterData setPgrf(float pPgrf)
-{
-    pgrf = pPgrf;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#pgrf}*/
-public float getPgrf()
-{
-    return pgrf; 
-}
-
-/** Setter for {@link IFFFundamentalParameterData#pulseWidth}*/
-public IFFFundamentalParameterData setPulseWidth(float pPulseWidth)
-{
-    pulseWidth = pPulseWidth;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#pulseWidth}*/
-public float getPulseWidth()
-{
-    return pulseWidth; 
-}
-
-/** Setter for {@link IFFFundamentalParameterData#burstLength}*/
-public IFFFundamentalParameterData setBurstLength(int pBurstLength)
-{
-    burstLength = pBurstLength;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#burstLength}*/
-public int getBurstLength()
-{
-    return burstLength; 
-}
-
-/** Setter for {@link IFFFundamentalParameterData#applicableModes}*/
-public IFFFundamentalParameterData setApplicableModes(IFFApplicableModes pApplicableModes)
-{
-    applicableModes = pApplicableModes;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#applicableModes}*/
-public IFFApplicableModes getApplicableModes()
-{
-    return applicableModes; 
-}
-
-/** Setter for {@link IFFFundamentalParameterData#systemSpecificData}*/
-public IFFFundamentalParameterData setSystemSpecificData(byte[] pSystemSpecificData)
-{
-    systemSpecificData = pSystemSpecificData;
-    return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#systemSpecificData}*/
-public byte[] getSystemSpecificData()
-{
-    return systemSpecificData; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(erp);
-       dos.writeFloat(frequency);
-       dos.writeFloat(pgrf);
-       dos.writeFloat(pulseWidth);
-       dos.writeInt(burstLength);
-       applicableModes.marshal(dos);
-
-       for(int idx = 0; idx < systemSpecificData.length; idx++)
-           dos.writeByte(systemSpecificData[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        erp = dis.readFloat();
-        uPosition += 4;
-        frequency = dis.readFloat();
-        uPosition += 4;
-        pgrf = dis.readFloat();
-        uPosition += 4;
-        pulseWidth = dis.readFloat();
-        uPosition += 4;
-        burstLength = dis.readInt();
-        uPosition += 4;
-        applicableModes = IFFApplicableModes.unmarshalEnum(dis);
-        uPosition += applicableModes.getMarshalledSize();
-        for(int idx = 0; idx < systemSpecificData.length; idx++)
-            systemSpecificData[idx] = dis.readByte();
-        uPosition += (systemSpecificData.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)erp);
-   buff.putFloat( (float)frequency);
-   buff.putFloat( (float)pgrf);
-   buff.putFloat( (float)pulseWidth);
-   buff.putInt( (int)burstLength);
-   applicableModes.marshal(buff);
-
-   for(int idx = 0; idx < systemSpecificData.length; idx++)
-       buff.put((byte)systemSpecificData[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    erp = buff.getFloat();
-    frequency = buff.getFloat();
-    pgrf = buff.getFloat();
-    pulseWidth = buff.getFloat();
-    burstLength = buff.getInt();
-    applicableModes = IFFApplicableModes.unmarshalEnum(buff);
-    for(int idx = 0; idx < systemSpecificData.length; idx++)
-        systemSpecificData[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IFFFundamentalParameterData rhs = (IFFFundamentalParameterData)obj;
-
-     if( ! (erp == rhs.erp)) ivarsEqual = false;
-     if( ! (frequency == rhs.frequency)) ivarsEqual = false;
-     if( ! (pgrf == rhs.pgrf)) ivarsEqual = false;
-     if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
-     if( ! (burstLength == rhs.burstLength)) ivarsEqual = false;
-     if( ! (applicableModes == rhs.applicableModes)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 3; idx++)
-     {
-          if(!(systemSpecificData[idx] == rhs.systemSpecificData[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" erp: ").append(erp).append("\n");
-    sb.append(" frequency: ").append(frequency).append("\n");
-    sb.append(" pgrf: ").append(pgrf).append("\n");
-    sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
-    sb.append(" burstLength: ").append(burstLength).append("\n");
-    sb.append(" applicableModes: ").append(applicableModes).append("\n");
-    sb.append(" systemSpecificData: ").append("\n");
-    sb.append(Arrays.toString(systemSpecificData)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
deleted file mode 100644
index 3cc46540b4e8ef679b609522fef7c8307d60d017..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup.            the beamData attribute semantics are used in multiple ways. UNFINSISHED
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IFFLayer2Pdu extends IFFPdu implements Serializable
-{
-   /** layer header */
-   protected LayerHeader  layerHeader = new LayerHeader(); 
-
-   /** beam data */
-   protected BeamData  beamData = new BeamData(); 
-
-   protected byte  secondaryOpParameter1;
-
-   protected byte  secondaryOpParameter2;
-
-   protected short  numberOfParameters;
-
-   /** variable length list of fundamental parameters. */
-   protected List< IFFFundamentalParameterData > fundamentalIFFParameters = new ArrayList< IFFFundamentalParameterData >();
- 
-
-/** Constructor */
- public IFFLayer2Pdu()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += layerHeader.getMarshalledSize();
-   marshalSize += beamData.getMarshalledSize();
-   marshalSize += 1;  // secondaryOpParameter1
-   marshalSize += 1;  // secondaryOpParameter2
-   marshalSize += 2;  // numberOfParameters
-   for(int idx=0; idx < fundamentalIFFParameters.size(); idx++)
-   {
-        IFFFundamentalParameterData listElement = fundamentalIFFParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IFFLayer2Pdu#layerHeader}*/
-public IFFLayer2Pdu setLayerHeader(LayerHeader pLayerHeader)
-{
-    layerHeader = pLayerHeader;
-    return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#layerHeader}*/
-public LayerHeader getLayerHeader()
-{
-    return layerHeader; 
-}
-
-/** Setter for {@link IFFLayer2Pdu#beamData}*/
-public IFFLayer2Pdu setBeamData(BeamData pBeamData)
-{
-    beamData = pBeamData;
-    return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#beamData}*/
-public BeamData getBeamData()
-{
-    return beamData; 
-}
-
-/** Setter for {@link IFFLayer2Pdu#secondaryOpParameter1}*/
-public IFFLayer2Pdu setSecondaryOpParameter1(byte pSecondaryOpParameter1)
-{
-    secondaryOpParameter1 = pSecondaryOpParameter1;
-    return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#secondaryOpParameter1}*/
-public byte getSecondaryOpParameter1()
-{
-    return secondaryOpParameter1; 
-}
-
-/** Setter for {@link IFFLayer2Pdu#secondaryOpParameter2}*/
-public IFFLayer2Pdu setSecondaryOpParameter2(byte pSecondaryOpParameter2)
-{
-    secondaryOpParameter2 = pSecondaryOpParameter2;
-    return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#secondaryOpParameter2}*/
-public byte getSecondaryOpParameter2()
-{
-    return secondaryOpParameter2; 
-}
-
-/** Setter for {@link IFFLayer2Pdu#fundamentalIFFParameters}*/
-public IFFLayer2Pdu setFundamentalIFFParameters(List<IFFFundamentalParameterData> pFundamentalIFFParameters)
-{
-    fundamentalIFFParameters = pFundamentalIFFParameters;
-    return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#fundamentalIFFParameters}*/
-public List<IFFFundamentalParameterData> getFundamentalIFFParameters()
-{
-    return fundamentalIFFParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       layerHeader.marshal(dos);
-       beamData.marshal(dos);
-       dos.writeByte(secondaryOpParameter1);
-       dos.writeByte(secondaryOpParameter2);
-       dos.writeShort(fundamentalIFFParameters.size());
-
-       for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
-       {
-            IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
-            aIFFFundamentalParameterData.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += layerHeader.unmarshal(dis);
-        uPosition += beamData.unmarshal(dis);
-        secondaryOpParameter1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        secondaryOpParameter2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfParameters = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfParameters; idx++)
-        {
-            IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
-            uPosition += anX.unmarshal(dis);
-            fundamentalIFFParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   layerHeader.marshal(buff);
-   beamData.marshal(buff);
-   buff.put( (byte)secondaryOpParameter1);
-   buff.put( (byte)secondaryOpParameter2);
-   buff.putShort( (short)fundamentalIFFParameters.size());
-
-   for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
-   {
-        IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
-        aIFFFundamentalParameterData.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    layerHeader.unmarshal(buff);
-    beamData.unmarshal(buff);
-    secondaryOpParameter1 = (byte)(buff.get() & 0xFF);
-    secondaryOpParameter2 = (byte)(buff.get() & 0xFF);
-    numberOfParameters = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfParameters; idx++)
-    {
-    IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
-    anX.unmarshal(buff);
-    fundamentalIFFParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IFFLayer2Pdu rhs = (IFFLayer2Pdu)obj;
-
-     if( ! (layerHeader.equals( rhs.layerHeader) )) ivarsEqual = false;
-     if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
-     if( ! (secondaryOpParameter1 == rhs.secondaryOpParameter1)) ivarsEqual = false;
-     if( ! (secondaryOpParameter2 == rhs.secondaryOpParameter2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
-        if( ! ( fundamentalIFFParameters.get(idx).equals(rhs.fundamentalIFFParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" layerHeader: ").append(layerHeader).append("\n");
-    sb.append(" beamData: ").append(beamData).append("\n");
-    sb.append(" secondaryOpParameter1: ").append(secondaryOpParameter1).append("\n");
-    sb.append(" secondaryOpParameter2: ").append(secondaryOpParameter2).append("\n");
-    sb.append(" fundamentalIFFParameters: ").append("\n");
-    fundamentalIFFParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
deleted file mode 100644
index dd7a93a94139370393d1063062b3c7b490e428f0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IFFPdu.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
-   /** ID of the entity that is the source of the emissions */
-   protected EntityID  emittingEntityId = new EntityID(); 
-
-   /** Number generated by the issuing simulation to associate realted events. */
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** Location wrt entity. There is some ambiguity in the standard here, but this is the order it is listed in the table. */
-   protected Vector3Float  location = new Vector3Float(); 
-
-   /** System ID information */
-   protected SystemIdentifier  systemID = new SystemIdentifier(); 
-
-   protected byte  systemDesignator;
-
-   protected byte  systemSpecificData;
-
-   /** fundamental parameters */
-   protected FundamentalOperationalData  fundamentalParameters = new FundamentalOperationalData(); 
-
-
-/** Constructor */
- public IFFPdu()
- {
-    setPduType( DISPDUType.IDENTIFICATION_FRIEND_OR_FOE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += emittingEntityId.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += location.getMarshalledSize();
-   marshalSize += systemID.getMarshalledSize();
-   marshalSize += 1;  // systemDesignator
-   marshalSize += 1;  // systemSpecificData
-   marshalSize += fundamentalParameters.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IFFPdu#emittingEntityId}*/
-public IFFPdu setEmittingEntityId(EntityID pEmittingEntityId)
-{
-    emittingEntityId = pEmittingEntityId;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#emittingEntityId}*/
-public EntityID getEmittingEntityId()
-{
-    return emittingEntityId; 
-}
-
-/** Setter for {@link IFFPdu#eventID}*/
-public IFFPdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link IFFPdu#location}*/
-public IFFPdu setLocation(Vector3Float pLocation)
-{
-    location = pLocation;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#location}*/
-public Vector3Float getLocation()
-{
-    return location; 
-}
-
-/** Setter for {@link IFFPdu#systemID}*/
-public IFFPdu setSystemID(SystemIdentifier pSystemID)
-{
-    systemID = pSystemID;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#systemID}*/
-public SystemIdentifier getSystemID()
-{
-    return systemID; 
-}
-
-/** Setter for {@link IFFPdu#systemDesignator}*/
-public IFFPdu setSystemDesignator(byte pSystemDesignator)
-{
-    systemDesignator = pSystemDesignator;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#systemDesignator}*/
-public byte getSystemDesignator()
-{
-    return systemDesignator; 
-}
-
-/** Setter for {@link IFFPdu#systemSpecificData}*/
-public IFFPdu setSystemSpecificData(byte pSystemSpecificData)
-{
-    systemSpecificData = pSystemSpecificData;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#systemSpecificData}*/
-public byte getSystemSpecificData()
-{
-    return systemSpecificData; 
-}
-
-/** Setter for {@link IFFPdu#fundamentalParameters}*/
-public IFFPdu setFundamentalParameters(FundamentalOperationalData pFundamentalParameters)
-{
-    fundamentalParameters = pFundamentalParameters;
-    return this;
-}
-
-/** Getter for {@link IFFPdu#fundamentalParameters}*/
-public FundamentalOperationalData getFundamentalParameters()
-{
-    return fundamentalParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       emittingEntityId.marshal(dos);
-       eventID.marshal(dos);
-       location.marshal(dos);
-       systemID.marshal(dos);
-       dos.writeByte(systemDesignator);
-       dos.writeByte(systemSpecificData);
-       fundamentalParameters.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += emittingEntityId.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        uPosition += location.unmarshal(dis);
-        uPosition += systemID.unmarshal(dis);
-        systemDesignator = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        systemSpecificData = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += fundamentalParameters.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   emittingEntityId.marshal(buff);
-   eventID.marshal(buff);
-   location.marshal(buff);
-   systemID.marshal(buff);
-   buff.put( (byte)systemDesignator);
-   buff.put( (byte)systemSpecificData);
-   fundamentalParameters.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    emittingEntityId.unmarshal(buff);
-    eventID.unmarshal(buff);
-    location.unmarshal(buff);
-    systemID.unmarshal(buff);
-    systemDesignator = (byte)(buff.get() & 0xFF);
-    systemSpecificData = (byte)(buff.get() & 0xFF);
-    fundamentalParameters.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IFFPdu rhs = (IFFPdu)obj;
-
-     if( ! (emittingEntityId.equals( rhs.emittingEntityId) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-     if( ! (systemID.equals( rhs.systemID) )) ivarsEqual = false;
-     if( ! (systemDesignator == rhs.systemDesignator)) ivarsEqual = false;
-     if( ! (systemSpecificData == rhs.systemSpecificData)) ivarsEqual = false;
-     if( ! (fundamentalParameters.equals( rhs.fundamentalParameters) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" emittingEntityId: ").append(emittingEntityId).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" location: ").append(location).append("\n");
-    sb.append(" systemID: ").append(systemID).append("\n");
-    sb.append(" systemDesignator: ").append(systemDesignator).append("\n");
-    sb.append(" systemSpecificData: ").append(systemSpecificData).append("\n");
-    sb.append(" fundamentalParameters: ").append(fundamentalParameters).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
deleted file mode 100644
index 9ded36d2d3a812efde17241d78f4a65f94d3293e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.48.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IOCommsNodeRecord extends IORecord implements Serializable
-{
-   /**  uid 66 */
-   protected VariableRecordType recordType = VariableRecordType.IO_COMMUNICATIONS_NODE;
-
-   protected short  recordLength;
-
-   /**  uid 294 */
-   protected IOCommsNodeRecordCommsNodeType commsNodeType = IOCommsNodeRecordCommsNodeType.values()[0];
-
-   protected byte  padding;
-
-   protected CommunicationsNodeID  commsNodeId = new CommunicationsNodeID(); 
-
-
-/** Constructor */
- public IOCommsNodeRecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 2;  // recordLength
-   marshalSize += commsNodeType.getMarshalledSize();
-   marshalSize += 1;  // padding
-   marshalSize += commsNodeId.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IOCommsNodeRecord#recordType}*/
-public IOCommsNodeRecord setRecordType(VariableRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#recordType}*/
-public VariableRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link IOCommsNodeRecord#recordLength}*/
-public IOCommsNodeRecord setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link IOCommsNodeRecord#commsNodeType}*/
-public IOCommsNodeRecord setCommsNodeType(IOCommsNodeRecordCommsNodeType pCommsNodeType)
-{
-    commsNodeType = pCommsNodeType;
-    return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#commsNodeType}*/
-public IOCommsNodeRecordCommsNodeType getCommsNodeType()
-{
-    return commsNodeType; 
-}
-
-/** Setter for {@link IOCommsNodeRecord#padding}*/
-public IOCommsNodeRecord setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link IOCommsNodeRecord#commsNodeId}*/
-public IOCommsNodeRecord setCommsNodeId(CommunicationsNodeID pCommsNodeId)
-{
-    commsNodeId = pCommsNodeId;
-    return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#commsNodeId}*/
-public CommunicationsNodeID getCommsNodeId()
-{
-    return commsNodeId; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeShort(recordLength);
-       commsNodeType.marshal(dos);
-       dos.writeByte(padding);
-       commsNodeId.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        recordType = VariableRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        commsNodeType = IOCommsNodeRecordCommsNodeType.unmarshalEnum(dis);
-        uPosition += commsNodeType.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += commsNodeId.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   recordType.marshal(buff);
-   buff.putShort( (short)recordLength);
-   commsNodeType.marshal(buff);
-   buff.put( (byte)padding);
-   commsNodeId.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    recordType = VariableRecordType.unmarshalEnum(buff);
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    commsNodeType = IOCommsNodeRecordCommsNodeType.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    commsNodeId.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IOCommsNodeRecord rhs = (IOCommsNodeRecord)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (commsNodeType == rhs.commsNodeType)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (commsNodeId.equals( rhs.commsNodeId) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" commsNodeType: ").append(commsNodeType).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" commsNodeId: ").append(commsNodeId).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
deleted file mode 100644
index 0f270941f9d992543f422a4b10584a51628955a4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.48.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IOEffectRecord extends IORecord implements Serializable
-{
-   /**  uid 66 */
-   protected VariableRecordType recordType = VariableRecordType.IO_EFFECT;
-
-   protected short  recordLength;
-
-   /**  uid 290 */
-   protected IOEffectsRecordIOStatus ioStatus = IOEffectsRecordIOStatus.values()[0];
-
-   /**  uid 291 */
-   protected IOEffectsRecordIOLinkType ioLinkType = IOEffectsRecordIOLinkType.values()[0];
-
-   /**  uid 292 */
-   protected IOEffectsRecordIOEffect ioEffect = IOEffectsRecordIOEffect.values()[0];
-
-   protected byte  ioEffectDutyCycle;
-
-   protected short  ioEffectDuration;
-
-   /**  uid 293 */
-   protected IOEffectsRecordIOProcess ioProcess = IOEffectsRecordIOProcess.values()[0];
-
-   protected short  padding;
-
-
-/** Constructor */
- public IOEffectRecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 2;  // recordLength
-   marshalSize += ioStatus.getMarshalledSize();
-   marshalSize += ioLinkType.getMarshalledSize();
-   marshalSize += ioEffect.getMarshalledSize();
-   marshalSize += 1;  // ioEffectDutyCycle
-   marshalSize += 2;  // ioEffectDuration
-   marshalSize += ioProcess.getMarshalledSize();
-   marshalSize += 2;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IOEffectRecord#recordType}*/
-public IOEffectRecord setRecordType(VariableRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#recordType}*/
-public VariableRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link IOEffectRecord#recordLength}*/
-public IOEffectRecord setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link IOEffectRecord#ioStatus}*/
-public IOEffectRecord setIoStatus(IOEffectsRecordIOStatus pIoStatus)
-{
-    ioStatus = pIoStatus;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioStatus}*/
-public IOEffectsRecordIOStatus getIoStatus()
-{
-    return ioStatus; 
-}
-
-/** Setter for {@link IOEffectRecord#ioLinkType}*/
-public IOEffectRecord setIoLinkType(IOEffectsRecordIOLinkType pIoLinkType)
-{
-    ioLinkType = pIoLinkType;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioLinkType}*/
-public IOEffectsRecordIOLinkType getIoLinkType()
-{
-    return ioLinkType; 
-}
-
-/** Setter for {@link IOEffectRecord#ioEffect}*/
-public IOEffectRecord setIoEffect(IOEffectsRecordIOEffect pIoEffect)
-{
-    ioEffect = pIoEffect;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioEffect}*/
-public IOEffectsRecordIOEffect getIoEffect()
-{
-    return ioEffect; 
-}
-
-/** Setter for {@link IOEffectRecord#ioEffectDutyCycle}*/
-public IOEffectRecord setIoEffectDutyCycle(byte pIoEffectDutyCycle)
-{
-    ioEffectDutyCycle = pIoEffectDutyCycle;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioEffectDutyCycle}*/
-public byte getIoEffectDutyCycle()
-{
-    return ioEffectDutyCycle; 
-}
-
-/** Setter for {@link IOEffectRecord#ioEffectDuration}*/
-public IOEffectRecord setIoEffectDuration(short pIoEffectDuration)
-{
-    ioEffectDuration = pIoEffectDuration;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioEffectDuration}*/
-public short getIoEffectDuration()
-{
-    return ioEffectDuration; 
-}
-
-/** Setter for {@link IOEffectRecord#ioProcess}*/
-public IOEffectRecord setIoProcess(IOEffectsRecordIOProcess pIoProcess)
-{
-    ioProcess = pIoProcess;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioProcess}*/
-public IOEffectsRecordIOProcess getIoProcess()
-{
-    return ioProcess; 
-}
-
-/** Setter for {@link IOEffectRecord#padding}*/
-public IOEffectRecord setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link IOEffectRecord#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeShort(recordLength);
-       ioStatus.marshal(dos);
-       ioLinkType.marshal(dos);
-       ioEffect.marshal(dos);
-       dos.writeByte(ioEffectDutyCycle);
-       dos.writeShort(ioEffectDuration);
-       ioProcess.marshal(dos);
-       dos.writeShort(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        recordType = VariableRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        ioStatus = IOEffectsRecordIOStatus.unmarshalEnum(dis);
-        uPosition += ioStatus.getMarshalledSize();
-        ioLinkType = IOEffectsRecordIOLinkType.unmarshalEnum(dis);
-        uPosition += ioLinkType.getMarshalledSize();
-        ioEffect = IOEffectsRecordIOEffect.unmarshalEnum(dis);
-        uPosition += ioEffect.getMarshalledSize();
-        ioEffectDutyCycle = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        ioEffectDuration = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        ioProcess = IOEffectsRecordIOProcess.unmarshalEnum(dis);
-        uPosition += ioProcess.getMarshalledSize();
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   recordType.marshal(buff);
-   buff.putShort( (short)recordLength);
-   ioStatus.marshal(buff);
-   ioLinkType.marshal(buff);
-   ioEffect.marshal(buff);
-   buff.put( (byte)ioEffectDutyCycle);
-   buff.putShort( (short)ioEffectDuration);
-   ioProcess.marshal(buff);
-   buff.putShort( (short)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    recordType = VariableRecordType.unmarshalEnum(buff);
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    ioStatus = IOEffectsRecordIOStatus.unmarshalEnum(buff);
-    ioLinkType = IOEffectsRecordIOLinkType.unmarshalEnum(buff);
-    ioEffect = IOEffectsRecordIOEffect.unmarshalEnum(buff);
-    ioEffectDutyCycle = (byte)(buff.get() & 0xFF);
-    ioEffectDuration = (short)(buff.getShort() & 0xFFFF);
-    ioProcess = IOEffectsRecordIOProcess.unmarshalEnum(buff);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IOEffectRecord rhs = (IOEffectRecord)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (ioStatus == rhs.ioStatus)) ivarsEqual = false;
-     if( ! (ioLinkType == rhs.ioLinkType)) ivarsEqual = false;
-     if( ! (ioEffect == rhs.ioEffect)) ivarsEqual = false;
-     if( ! (ioEffectDutyCycle == rhs.ioEffectDutyCycle)) ivarsEqual = false;
-     if( ! (ioEffectDuration == rhs.ioEffectDuration)) ivarsEqual = false;
-     if( ! (ioProcess == rhs.ioProcess)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" ioStatus: ").append(ioStatus).append("\n");
-    sb.append(" ioLinkType: ").append(ioLinkType).append("\n");
-    sb.append(" ioEffect: ").append(ioEffect).append("\n");
-    sb.append(" ioEffectDutyCycle: ").append(ioEffectDutyCycle).append("\n");
-    sb.append(" ioEffectDuration: ").append(ioEffectDuration).append("\n");
-    sb.append(" ioProcess: ").append(ioProcess).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IORecord.java b/src-generated/edu/nps/moves/dis7/IORecord.java
deleted file mode 100644
index 8b4e82d4969205174dafffce7a9f6c4224d57cae..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IORecord.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.48
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IORecord extends Object implements Serializable
-{
-
-/** Constructor */
- public IORecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IORecord rhs = (IORecord)obj;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
deleted file mode 100644
index 7d412aecfa9dd4c5860fa595c38b604827e87b69..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for an IFFPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IdentificationFriendOrFoePdu extends IFFPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
deleted file mode 100644
index 9e1ef327044bf8fe66c2ef74c31bb4978661f3f8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Requires hand coding to be useful. Section 6.2.43
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IffDataSpecification extends Object implements Serializable
-{
-   /** Number of iff records */
-   protected short  numberOfIffDataRecords;
-
-   /** IFF data records */
-   protected List< IFFData > iffDataRecords = new ArrayList< IFFData >();
- 
-
-/** Constructor */
- public IffDataSpecification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // numberOfIffDataRecords
-   for(int idx=0; idx < iffDataRecords.size(); idx++)
-   {
-        IFFData listElement = iffDataRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IffDataSpecification#iffDataRecords}*/
-public IffDataSpecification setIffDataRecords(List<IFFData> pIffDataRecords)
-{
-    iffDataRecords = pIffDataRecords;
-    return this;
-}
-
-/** Getter for {@link IffDataSpecification#iffDataRecords}*/
-public List<IFFData> getIffDataRecords()
-{
-    return iffDataRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(iffDataRecords.size());
-
-       for(int idx = 0; idx < iffDataRecords.size(); idx++)
-       {
-            IFFData aIFFData = iffDataRecords.get(idx);
-            aIFFData.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfIffDataRecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfIffDataRecords; idx++)
-        {
-            IFFData anX = new IFFData();
-            uPosition += anX.unmarshal(dis);
-            iffDataRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)iffDataRecords.size());
-
-   for(int idx = 0; idx < iffDataRecords.size(); idx++)
-   {
-        IFFData aIFFData = iffDataRecords.get(idx);
-        aIFFData.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfIffDataRecords = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfIffDataRecords; idx++)
-    {
-    IFFData anX = new IFFData();
-    anX.unmarshal(buff);
-    iffDataRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IffDataSpecification rhs = (IffDataSpecification)obj;
-
-
-     for(int idx = 0; idx < iffDataRecords.size(); idx++)
-        if( ! ( iffDataRecords.get(idx).equals(rhs.iffDataRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" iffDataRecords: ").append("\n");
-    iffDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
deleted file mode 100644
index 5525279381ef9ac16d4989e81cdf9dd2efe04ddc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.13.3.1 Used to communicate an IO attack or the effects of an IO attack on one or more target entities.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class InformationOperationsActionPdu extends InformationOperationsFamilyPdu implements Serializable
-{
-   /** the simulation to which this PDU is addressed */
-   protected EntityID  receivingSimID = new EntityID(); 
-
-   /** request ID */
-   protected int  requestID;
-
-   /**  uid 285 */
-   protected IOActionIOWarfareType IOWarfareType = IOActionIOWarfareType.values()[0];
-
-   /**  uid 286 */
-   protected IOActionIOSimulationSource IOSimulationSource = IOActionIOSimulationSource.values()[0];
-
-   /**  uid 287 */
-   protected IOActionIOActionType IOActionType = IOActionIOActionType.values()[0];
-
-   /**  uid 288 */
-   protected IOActionIOActionPhase IOActionPhase = IOActionIOActionPhase.values()[0];
-
-   protected int  padding1;
-
-   protected EntityID  ioAttackerID = new EntityID(); 
-
-   protected EntityID  ioPrimaryTargetID = new EntityID(); 
-
-   protected short  padding2;
-
-   protected short  numberOfIORecords;
-
-   protected List< IORecord > ioRecords = new ArrayList< IORecord >();
- 
-
-/** Constructor */
- public InformationOperationsActionPdu()
- {
-    setPduType( DISPDUType.INFORMATION_OPERATIONS_ACTION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += receivingSimID.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += IOWarfareType.getMarshalledSize();
-   marshalSize += IOSimulationSource.getMarshalledSize();
-   marshalSize += IOActionType.getMarshalledSize();
-   marshalSize += IOActionPhase.getMarshalledSize();
-   marshalSize += 4;  // padding1
-   marshalSize += ioAttackerID.getMarshalledSize();
-   marshalSize += ioPrimaryTargetID.getMarshalledSize();
-   marshalSize += 2;  // padding2
-   marshalSize += 2;  // numberOfIORecords
-   for(int idx=0; idx < ioRecords.size(); idx++)
-   {
-        IORecord listElement = ioRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link InformationOperationsActionPdu#receivingSimID}*/
-public InformationOperationsActionPdu setReceivingSimID(EntityID pReceivingSimID)
-{
-    receivingSimID = pReceivingSimID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#receivingSimID}*/
-public EntityID getReceivingSimID()
-{
-    return receivingSimID; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#requestID}*/
-public InformationOperationsActionPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOWarfareType}*/
-public InformationOperationsActionPdu setIOWarfareType(IOActionIOWarfareType pIOWarfareType)
-{
-    IOWarfareType = pIOWarfareType;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOWarfareType}*/
-public IOActionIOWarfareType getIOWarfareType()
-{
-    return IOWarfareType; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOSimulationSource}*/
-public InformationOperationsActionPdu setIOSimulationSource(IOActionIOSimulationSource pIOSimulationSource)
-{
-    IOSimulationSource = pIOSimulationSource;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOSimulationSource}*/
-public IOActionIOSimulationSource getIOSimulationSource()
-{
-    return IOSimulationSource; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOActionType}*/
-public InformationOperationsActionPdu setIOActionType(IOActionIOActionType pIOActionType)
-{
-    IOActionType = pIOActionType;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOActionType}*/
-public IOActionIOActionType getIOActionType()
-{
-    return IOActionType; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOActionPhase}*/
-public InformationOperationsActionPdu setIOActionPhase(IOActionIOActionPhase pIOActionPhase)
-{
-    IOActionPhase = pIOActionPhase;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOActionPhase}*/
-public IOActionIOActionPhase getIOActionPhase()
-{
-    return IOActionPhase; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#padding1}*/
-public InformationOperationsActionPdu setPadding1(int pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#padding1}*/
-public int getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#ioAttackerID}*/
-public InformationOperationsActionPdu setIoAttackerID(EntityID pIoAttackerID)
-{
-    ioAttackerID = pIoAttackerID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#ioAttackerID}*/
-public EntityID getIoAttackerID()
-{
-    return ioAttackerID; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#ioPrimaryTargetID}*/
-public InformationOperationsActionPdu setIoPrimaryTargetID(EntityID pIoPrimaryTargetID)
-{
-    ioPrimaryTargetID = pIoPrimaryTargetID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#ioPrimaryTargetID}*/
-public EntityID getIoPrimaryTargetID()
-{
-    return ioPrimaryTargetID; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#padding2}*/
-public InformationOperationsActionPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link InformationOperationsActionPdu#ioRecords}*/
-public InformationOperationsActionPdu setIoRecords(List<IORecord> pIoRecords)
-{
-    ioRecords = pIoRecords;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#ioRecords}*/
-public List<IORecord> getIoRecords()
-{
-    return ioRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       receivingSimID.marshal(dos);
-       dos.writeInt(requestID);
-       IOWarfareType.marshal(dos);
-       IOSimulationSource.marshal(dos);
-       IOActionType.marshal(dos);
-       IOActionPhase.marshal(dos);
-       dos.writeInt(padding1);
-       ioAttackerID.marshal(dos);
-       ioPrimaryTargetID.marshal(dos);
-       dos.writeShort(padding2);
-       dos.writeShort(ioRecords.size());
-
-       for(int idx = 0; idx < ioRecords.size(); idx++)
-       {
-            IORecord aIORecord = ioRecords.get(idx);
-            aIORecord.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += receivingSimID.unmarshal(dis);
-        requestID = dis.readInt();
-        uPosition += 4;
-        IOWarfareType = IOActionIOWarfareType.unmarshalEnum(dis);
-        uPosition += IOWarfareType.getMarshalledSize();
-        IOSimulationSource = IOActionIOSimulationSource.unmarshalEnum(dis);
-        uPosition += IOSimulationSource.getMarshalledSize();
-        IOActionType = IOActionIOActionType.unmarshalEnum(dis);
-        uPosition += IOActionType.getMarshalledSize();
-        IOActionPhase = IOActionIOActionPhase.unmarshalEnum(dis);
-        uPosition += IOActionPhase.getMarshalledSize();
-        padding1 = dis.readInt();
-        uPosition += 4;
-        uPosition += ioAttackerID.unmarshal(dis);
-        uPosition += ioPrimaryTargetID.unmarshal(dis);
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfIORecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfIORecords; idx++)
-        {
-            IORecord anX = new IORecord();
-            uPosition += anX.unmarshal(dis);
-            ioRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   receivingSimID.marshal(buff);
-   buff.putInt( (int)requestID);
-   IOWarfareType.marshal(buff);
-   IOSimulationSource.marshal(buff);
-   IOActionType.marshal(buff);
-   IOActionPhase.marshal(buff);
-   buff.putInt( (int)padding1);
-   ioAttackerID.marshal(buff);
-   ioPrimaryTargetID.marshal(buff);
-   buff.putShort( (short)padding2);
-   buff.putShort( (short)ioRecords.size());
-
-   for(int idx = 0; idx < ioRecords.size(); idx++)
-   {
-        IORecord aIORecord = ioRecords.get(idx);
-        aIORecord.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    receivingSimID.unmarshal(buff);
-    requestID = buff.getInt();
-    IOWarfareType = IOActionIOWarfareType.unmarshalEnum(buff);
-    IOSimulationSource = IOActionIOSimulationSource.unmarshalEnum(buff);
-    IOActionType = IOActionIOActionType.unmarshalEnum(buff);
-    IOActionPhase = IOActionIOActionPhase.unmarshalEnum(buff);
-    padding1 = buff.getInt();
-    ioAttackerID.unmarshal(buff);
-    ioPrimaryTargetID.unmarshal(buff);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    numberOfIORecords = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfIORecords; idx++)
-    {
-    IORecord anX = new IORecord();
-    anX.unmarshal(buff);
-    ioRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final InformationOperationsActionPdu rhs = (InformationOperationsActionPdu)obj;
-
-     if( ! (receivingSimID.equals( rhs.receivingSimID) )) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (IOWarfareType == rhs.IOWarfareType)) ivarsEqual = false;
-     if( ! (IOSimulationSource == rhs.IOSimulationSource)) ivarsEqual = false;
-     if( ! (IOActionType == rhs.IOActionType)) ivarsEqual = false;
-     if( ! (IOActionPhase == rhs.IOActionPhase)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (ioAttackerID.equals( rhs.ioAttackerID) )) ivarsEqual = false;
-     if( ! (ioPrimaryTargetID.equals( rhs.ioPrimaryTargetID) )) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < ioRecords.size(); idx++)
-        if( ! ( ioRecords.get(idx).equals(rhs.ioRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" receivingSimID: ").append(receivingSimID).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" IOWarfareType: ").append(IOWarfareType).append("\n");
-    sb.append(" IOSimulationSource: ").append(IOSimulationSource).append("\n");
-    sb.append(" IOActionType: ").append(IOActionType).append("\n");
-    sb.append(" IOActionPhase: ").append(IOActionPhase).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
-    sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" ioRecords: ").append("\n");
-    ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
deleted file mode 100644
index 32fee552194a78144537419b66e234d06f7b114f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class InformationOperationsFamilyPdu extends PduBase implements Serializable
-{
-   /** Object originating the request */
-   protected EntityID  originatingSimID = new EntityID(); 
-
-
-/** Constructor */
- public InformationOperationsFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.INFORMATION_OPERATIONS );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += originatingSimID.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link InformationOperationsFamilyPdu#originatingSimID}*/
-public InformationOperationsFamilyPdu setOriginatingSimID(EntityID pOriginatingSimID)
-{
-    originatingSimID = pOriginatingSimID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsFamilyPdu#originatingSimID}*/
-public EntityID getOriginatingSimID()
-{
-    return originatingSimID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       originatingSimID.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += originatingSimID.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   originatingSimID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    originatingSimID.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final InformationOperationsFamilyPdu rhs = (InformationOperationsFamilyPdu)obj;
-
-     if( ! (originatingSimID.equals( rhs.originatingSimID) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" originatingSimID: ").append(originatingSimID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
deleted file mode 100644
index 018d02995a60f8bfd2835152cd75b9694eee9809..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.13.4.1 Used to communicate the effects of an IO attack on one or more target entities.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class InformationOperationsReportPdu extends InformationOperationsFamilyPdu implements Serializable
-{
-   /**  uid 286 */
-   protected IOActionIOSimulationSource ioSimSource = IOActionIOSimulationSource.values()[0];
-
-   /** request ID uid 289 */
-   protected IOReportIOReportType ioReportType = IOReportIOReportType.values()[0];
-
-   protected byte  padding1;
-
-   protected EntityID  ioAttackerID = new EntityID(); 
-
-   protected EntityID  ioPrimaryTargetID = new EntityID(); 
-
-   protected short  padding2;
-
-   protected short  padding3;
-
-   protected short  numberOfIORecords;
-
-   protected List< IORecord > ioRecords = new ArrayList< IORecord >();
- 
-
-/** Constructor */
- public InformationOperationsReportPdu()
- {
-    setPduType( DISPDUType.INFORMATION_OPERATIONS_REPORT );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += ioSimSource.getMarshalledSize();
-   marshalSize += ioReportType.getMarshalledSize();
-   marshalSize += 1;  // padding1
-   marshalSize += ioAttackerID.getMarshalledSize();
-   marshalSize += ioPrimaryTargetID.getMarshalledSize();
-   marshalSize += 2;  // padding2
-   marshalSize += 2;  // padding3
-   marshalSize += 2;  // numberOfIORecords
-   for(int idx=0; idx < ioRecords.size(); idx++)
-   {
-        IORecord listElement = ioRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link InformationOperationsReportPdu#ioSimSource}*/
-public InformationOperationsReportPdu setIoSimSource(IOActionIOSimulationSource pIoSimSource)
-{
-    ioSimSource = pIoSimSource;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioSimSource}*/
-public IOActionIOSimulationSource getIoSimSource()
-{
-    return ioSimSource; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioReportType}*/
-public InformationOperationsReportPdu setIoReportType(IOReportIOReportType pIoReportType)
-{
-    ioReportType = pIoReportType;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioReportType}*/
-public IOReportIOReportType getIoReportType()
-{
-    return ioReportType; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#padding1}*/
-public InformationOperationsReportPdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioAttackerID}*/
-public InformationOperationsReportPdu setIoAttackerID(EntityID pIoAttackerID)
-{
-    ioAttackerID = pIoAttackerID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioAttackerID}*/
-public EntityID getIoAttackerID()
-{
-    return ioAttackerID; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioPrimaryTargetID}*/
-public InformationOperationsReportPdu setIoPrimaryTargetID(EntityID pIoPrimaryTargetID)
-{
-    ioPrimaryTargetID = pIoPrimaryTargetID;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioPrimaryTargetID}*/
-public EntityID getIoPrimaryTargetID()
-{
-    return ioPrimaryTargetID; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#padding2}*/
-public InformationOperationsReportPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#padding3}*/
-public InformationOperationsReportPdu setPadding3(short pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#padding3}*/
-public short getPadding3()
-{
-    return padding3; 
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioRecords}*/
-public InformationOperationsReportPdu setIoRecords(List<IORecord> pIoRecords)
-{
-    ioRecords = pIoRecords;
-    return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioRecords}*/
-public List<IORecord> getIoRecords()
-{
-    return ioRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       ioSimSource.marshal(dos);
-       ioReportType.marshal(dos);
-       dos.writeByte(padding1);
-       ioAttackerID.marshal(dos);
-       ioPrimaryTargetID.marshal(dos);
-       dos.writeShort(padding2);
-       dos.writeShort(padding3);
-       dos.writeShort(ioRecords.size());
-
-       for(int idx = 0; idx < ioRecords.size(); idx++)
-       {
-            IORecord aIORecord = ioRecords.get(idx);
-            aIORecord.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        ioSimSource = IOActionIOSimulationSource.unmarshalEnum(dis);
-        uPosition += ioSimSource.getMarshalledSize();
-        ioReportType = IOReportIOReportType.unmarshalEnum(dis);
-        uPosition += ioReportType.getMarshalledSize();
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += ioAttackerID.unmarshal(dis);
-        uPosition += ioPrimaryTargetID.unmarshal(dis);
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding3 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfIORecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfIORecords; idx++)
-        {
-            IORecord anX = new IORecord();
-            uPosition += anX.unmarshal(dis);
-            ioRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   ioSimSource.marshal(buff);
-   ioReportType.marshal(buff);
-   buff.put( (byte)padding1);
-   ioAttackerID.marshal(buff);
-   ioPrimaryTargetID.marshal(buff);
-   buff.putShort( (short)padding2);
-   buff.putShort( (short)padding3);
-   buff.putShort( (short)ioRecords.size());
-
-   for(int idx = 0; idx < ioRecords.size(); idx++)
-   {
-        IORecord aIORecord = ioRecords.get(idx);
-        aIORecord.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    ioSimSource = IOActionIOSimulationSource.unmarshalEnum(buff);
-    ioReportType = IOReportIOReportType.unmarshalEnum(buff);
-    padding1 = (byte)(buff.get() & 0xFF);
-    ioAttackerID.unmarshal(buff);
-    ioPrimaryTargetID.unmarshal(buff);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    padding3 = (short)(buff.getShort() & 0xFFFF);
-    numberOfIORecords = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfIORecords; idx++)
-    {
-    IORecord anX = new IORecord();
-    anX.unmarshal(buff);
-    ioRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final InformationOperationsReportPdu rhs = (InformationOperationsReportPdu)obj;
-
-     if( ! (ioSimSource == rhs.ioSimSource)) ivarsEqual = false;
-     if( ! (ioReportType == rhs.ioReportType)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (ioAttackerID.equals( rhs.ioAttackerID) )) ivarsEqual = false;
-     if( ! (ioPrimaryTargetID.equals( rhs.ioPrimaryTargetID) )) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-
-     for(int idx = 0; idx < ioRecords.size(); idx++)
-        if( ! ( ioRecords.get(idx).equals(rhs.ioRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" ioSimSource: ").append(ioSimSource).append("\n");
-    sb.append(" ioReportType: ").append(ioReportType).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
-    sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-    sb.append(" ioRecords: ").append("\n");
-    ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
deleted file mode 100644
index ea362b0c9ae2a35a789c70f728450cd6de5fa7b8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Intercom communications parameters. Section 6.2.46
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IntercomCommunicationsParameters extends Object implements Serializable
-{
-   /** Type of intercom parameters record uid 185 */
-   protected IntercomControlRecordType recordType = IntercomControlRecordType.values()[0];
-
-   /** length of record */
-   protected short  recordLength;
-
-   /** This is a placeholder. */
-   protected byte[]  recordSpecificField = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 32-bit boundary
-
-
-/** Constructor */
- public IntercomCommunicationsParameters()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 2;  // recordLength
-   marshalSize += recordSpecificField.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IntercomCommunicationsParameters#recordType}*/
-public IntercomCommunicationsParameters setRecordType(IntercomControlRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link IntercomCommunicationsParameters#recordType}*/
-public IntercomControlRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link IntercomCommunicationsParameters#recordLength}*/
-public IntercomCommunicationsParameters setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link IntercomCommunicationsParameters#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link IntercomCommunicationsParameters#recordSpecificField}*/
-public IntercomCommunicationsParameters setRecordSpecificField(byte[] pRecordSpecificField)
-{
-    recordSpecificField = pRecordSpecificField;
-    return this;
-}
-
-/** Getter for {@link IntercomCommunicationsParameters#recordSpecificField}*/
-public byte[] getRecordSpecificField()
-{
-    return recordSpecificField; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeShort(recordLength);
-
-       for(int idx = 0; idx < recordSpecificField.length; idx++)
-           dos.writeByte(recordSpecificField[idx]);
-
-       padding = new byte[Align.to32bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = IntercomControlRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < recordSpecificField.length; idx++)
-            recordSpecificField[idx] = dis.readByte();
-        uPosition += (recordSpecificField.length * 1);
-        padding = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   buff.putShort( (short)recordLength);
-
-   for(int idx = 0; idx < recordSpecificField.length; idx++)
-       buff.put((byte)recordSpecificField[idx]);
-
-   padding = new byte[Align.to32bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = IntercomControlRecordType.unmarshalEnum(buff);
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < recordSpecificField.length; idx++)
-        recordSpecificField[idx] = buff.get();
-    padding = new byte[Align.from32bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IntercomCommunicationsParameters rhs = (IntercomCommunicationsParameters)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordSpecificField[idx] == rhs.recordSpecificField[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" recordSpecificField: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificField)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
deleted file mode 100644
index 6c48dd397c66fddc595a4c5a669da64ad7b0ff42..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.7 Communicates the state of a particular intercom device, request an action of another intercom device, or respond to an action request.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IntercomControlPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
-   /** control type uid 180 */
-   protected IntercomControlControlType controlType = IntercomControlControlType.values()[0];
-
-   /** control type */
-   protected byte  communicationsChannelType;
-
-   /** Source entity ID, this can also be ObjectIdentifier or UnattachedIdentifier */
-   protected EntityID  sourceEntityID = new EntityID(); 
-
-   /** The specific intercom device being simulated within an entity. */
-   protected short  sourceIntercomNumber;
-
-   /** Line number to which the intercom control refers */
-   protected byte  sourceLineID;
-
-   /** priority of this message relative to transmissons from other intercom devices */
-   protected byte  transmitPriority;
-
-   /** current transmit state of the line uid 183 */
-   protected IntercomControlTransmitLineState transmitLineState = IntercomControlTransmitLineState.values()[0];
-
-   /** detailed type requested. uid 182 */
-   protected IntercomControlCommand command = IntercomControlCommand.values()[0];
-
-   /** eid of the entity that has created this intercom channel, same comments as sourceEntityId */
-   protected EntityID  masterIntercomReferenceID = new EntityID(); 
-
-   /** specific intercom device that has created this intercom channel */
-   protected short  masterIntercomNumber;
-
-   protected short  masterChannelID;
-
-   /** number of intercom parameters */
-   protected int  intercomParametersLength;
-
-   protected List< IntercomCommunicationsParameters > intercomParameters = new ArrayList< IntercomCommunicationsParameters >();
- 
-
-/** Constructor */
- public IntercomControlPdu()
- {
-    setPduType( DISPDUType.INTERCOM_CONTROL );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += controlType.getMarshalledSize();
-   marshalSize += 1;  // communicationsChannelType
-   marshalSize += sourceEntityID.getMarshalledSize();
-   marshalSize += 2;  // sourceIntercomNumber
-   marshalSize += 1;  // sourceLineID
-   marshalSize += 1;  // transmitPriority
-   marshalSize += transmitLineState.getMarshalledSize();
-   marshalSize += command.getMarshalledSize();
-   marshalSize += masterIntercomReferenceID.getMarshalledSize();
-   marshalSize += 2;  // masterIntercomNumber
-   marshalSize += 2;  // masterChannelID
-   marshalSize += 4;  // intercomParametersLength
-   for(int idx=0; idx < intercomParameters.size(); idx++)
-   {
-        IntercomCommunicationsParameters listElement = intercomParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IntercomControlPdu#controlType}*/
-public IntercomControlPdu setControlType(IntercomControlControlType pControlType)
-{
-    controlType = pControlType;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#controlType}*/
-public IntercomControlControlType getControlType()
-{
-    return controlType; 
-}
-
-/** Setter for {@link IntercomControlPdu#communicationsChannelType}*/
-public IntercomControlPdu setCommunicationsChannelType(byte pCommunicationsChannelType)
-{
-    communicationsChannelType = pCommunicationsChannelType;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#communicationsChannelType}*/
-public byte getCommunicationsChannelType()
-{
-    return communicationsChannelType; 
-}
-
-/** Setter for {@link IntercomControlPdu#sourceEntityID}*/
-public IntercomControlPdu setSourceEntityID(EntityID pSourceEntityID)
-{
-    sourceEntityID = pSourceEntityID;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#sourceEntityID}*/
-public EntityID getSourceEntityID()
-{
-    return sourceEntityID; 
-}
-
-/** Setter for {@link IntercomControlPdu#sourceIntercomNumber}*/
-public IntercomControlPdu setSourceIntercomNumber(short pSourceIntercomNumber)
-{
-    sourceIntercomNumber = pSourceIntercomNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#sourceIntercomNumber}*/
-public short getSourceIntercomNumber()
-{
-    return sourceIntercomNumber; 
-}
-
-/** Setter for {@link IntercomControlPdu#sourceLineID}*/
-public IntercomControlPdu setSourceLineID(byte pSourceLineID)
-{
-    sourceLineID = pSourceLineID;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#sourceLineID}*/
-public byte getSourceLineID()
-{
-    return sourceLineID; 
-}
-
-/** Setter for {@link IntercomControlPdu#transmitPriority}*/
-public IntercomControlPdu setTransmitPriority(byte pTransmitPriority)
-{
-    transmitPriority = pTransmitPriority;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#transmitPriority}*/
-public byte getTransmitPriority()
-{
-    return transmitPriority; 
-}
-
-/** Setter for {@link IntercomControlPdu#transmitLineState}*/
-public IntercomControlPdu setTransmitLineState(IntercomControlTransmitLineState pTransmitLineState)
-{
-    transmitLineState = pTransmitLineState;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#transmitLineState}*/
-public IntercomControlTransmitLineState getTransmitLineState()
-{
-    return transmitLineState; 
-}
-
-/** Setter for {@link IntercomControlPdu#command}*/
-public IntercomControlPdu setCommand(IntercomControlCommand pCommand)
-{
-    command = pCommand;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#command}*/
-public IntercomControlCommand getCommand()
-{
-    return command; 
-}
-
-/** Setter for {@link IntercomControlPdu#masterIntercomReferenceID}*/
-public IntercomControlPdu setMasterIntercomReferenceID(EntityID pMasterIntercomReferenceID)
-{
-    masterIntercomReferenceID = pMasterIntercomReferenceID;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#masterIntercomReferenceID}*/
-public EntityID getMasterIntercomReferenceID()
-{
-    return masterIntercomReferenceID; 
-}
-
-/** Setter for {@link IntercomControlPdu#masterIntercomNumber}*/
-public IntercomControlPdu setMasterIntercomNumber(short pMasterIntercomNumber)
-{
-    masterIntercomNumber = pMasterIntercomNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#masterIntercomNumber}*/
-public short getMasterIntercomNumber()
-{
-    return masterIntercomNumber; 
-}
-
-/** Setter for {@link IntercomControlPdu#masterChannelID}*/
-public IntercomControlPdu setMasterChannelID(short pMasterChannelID)
-{
-    masterChannelID = pMasterChannelID;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#masterChannelID}*/
-public short getMasterChannelID()
-{
-    return masterChannelID; 
-}
-
-/** Setter for {@link IntercomControlPdu#intercomParameters}*/
-public IntercomControlPdu setIntercomParameters(List<IntercomCommunicationsParameters> pIntercomParameters)
-{
-    intercomParameters = pIntercomParameters;
-    return this;
-}
-
-/** Getter for {@link IntercomControlPdu#intercomParameters}*/
-public List<IntercomCommunicationsParameters> getIntercomParameters()
-{
-    return intercomParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       controlType.marshal(dos);
-       dos.writeByte(communicationsChannelType);
-       sourceEntityID.marshal(dos);
-       dos.writeShort(sourceIntercomNumber);
-       dos.writeByte(sourceLineID);
-       dos.writeByte(transmitPriority);
-       transmitLineState.marshal(dos);
-       command.marshal(dos);
-       masterIntercomReferenceID.marshal(dos);
-       dos.writeShort(masterIntercomNumber);
-       dos.writeShort(masterChannelID);
-       dos.writeInt(intercomParameters.size());
-
-       for(int idx = 0; idx < intercomParameters.size(); idx++)
-       {
-            IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
-            aIntercomCommunicationsParameters.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        controlType = IntercomControlControlType.unmarshalEnum(dis);
-        uPosition += controlType.getMarshalledSize();
-        communicationsChannelType = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += sourceEntityID.unmarshal(dis);
-        sourceIntercomNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        sourceLineID = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        transmitPriority = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        transmitLineState = IntercomControlTransmitLineState.unmarshalEnum(dis);
-        uPosition += transmitLineState.getMarshalledSize();
-        command = IntercomControlCommand.unmarshalEnum(dis);
-        uPosition += command.getMarshalledSize();
-        uPosition += masterIntercomReferenceID.unmarshal(dis);
-        masterIntercomNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        masterChannelID = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        intercomParametersLength = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < intercomParametersLength; idx++)
-        {
-            IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
-            uPosition += anX.unmarshal(dis);
-            intercomParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   controlType.marshal(buff);
-   buff.put( (byte)communicationsChannelType);
-   sourceEntityID.marshal(buff);
-   buff.putShort( (short)sourceIntercomNumber);
-   buff.put( (byte)sourceLineID);
-   buff.put( (byte)transmitPriority);
-   transmitLineState.marshal(buff);
-   command.marshal(buff);
-   masterIntercomReferenceID.marshal(buff);
-   buff.putShort( (short)masterIntercomNumber);
-   buff.putShort( (short)masterChannelID);
-   buff.putInt( (int)intercomParameters.size());
-
-   for(int idx = 0; idx < intercomParameters.size(); idx++)
-   {
-        IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
-        aIntercomCommunicationsParameters.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    controlType = IntercomControlControlType.unmarshalEnum(buff);
-    communicationsChannelType = (byte)(buff.get() & 0xFF);
-    sourceEntityID.unmarshal(buff);
-    sourceIntercomNumber = (short)(buff.getShort() & 0xFFFF);
-    sourceLineID = (byte)(buff.get() & 0xFF);
-    transmitPriority = (byte)(buff.get() & 0xFF);
-    transmitLineState = IntercomControlTransmitLineState.unmarshalEnum(buff);
-    command = IntercomControlCommand.unmarshalEnum(buff);
-    masterIntercomReferenceID.unmarshal(buff);
-    masterIntercomNumber = (short)(buff.getShort() & 0xFFFF);
-    masterChannelID = (short)(buff.getShort() & 0xFFFF);
-    intercomParametersLength = buff.getInt();
-    for(int idx = 0; idx < intercomParametersLength; idx++)
-    {
-    IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
-    anX.unmarshal(buff);
-    intercomParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IntercomControlPdu rhs = (IntercomControlPdu)obj;
-
-     if( ! (controlType == rhs.controlType)) ivarsEqual = false;
-     if( ! (communicationsChannelType == rhs.communicationsChannelType)) ivarsEqual = false;
-     if( ! (sourceEntityID.equals( rhs.sourceEntityID) )) ivarsEqual = false;
-     if( ! (sourceIntercomNumber == rhs.sourceIntercomNumber)) ivarsEqual = false;
-     if( ! (sourceLineID == rhs.sourceLineID)) ivarsEqual = false;
-     if( ! (transmitPriority == rhs.transmitPriority)) ivarsEqual = false;
-     if( ! (transmitLineState == rhs.transmitLineState)) ivarsEqual = false;
-     if( ! (command == rhs.command)) ivarsEqual = false;
-     if( ! (masterIntercomReferenceID.equals( rhs.masterIntercomReferenceID) )) ivarsEqual = false;
-     if( ! (masterIntercomNumber == rhs.masterIntercomNumber)) ivarsEqual = false;
-     if( ! (masterChannelID == rhs.masterChannelID)) ivarsEqual = false;
-
-     for(int idx = 0; idx < intercomParameters.size(); idx++)
-        if( ! ( intercomParameters.get(idx).equals(rhs.intercomParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" controlType: ").append(controlType).append("\n");
-    sb.append(" communicationsChannelType: ").append(communicationsChannelType).append("\n");
-    sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
-    sb.append(" sourceIntercomNumber: ").append(sourceIntercomNumber).append("\n");
-    sb.append(" sourceLineID: ").append(sourceLineID).append("\n");
-    sb.append(" transmitPriority: ").append(transmitPriority).append("\n");
-    sb.append(" transmitLineState: ").append(transmitLineState).append("\n");
-    sb.append(" command: ").append(command).append("\n");
-    sb.append(" masterIntercomReferenceID: ").append(masterIntercomReferenceID).append("\n");
-    sb.append(" masterIntercomNumber: ").append(masterIntercomNumber).append("\n");
-    sb.append(" masterChannelID: ").append(masterChannelID).append("\n");
-    sb.append(" intercomParameters: ").append("\n");
-    intercomParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
deleted file mode 100644
index d723557f8c041cdc935884a30781b4400e0b196e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IntercomIdentifier extends Object implements Serializable
-{
-   protected short  siteNumber;
-
-   protected short  applicationNumber;
-
-   protected short  referenceNumber;
-
-   protected short  intercomNumber;
-
-
-/** Constructor */
- public IntercomIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // siteNumber
-   marshalSize += 2;  // applicationNumber
-   marshalSize += 2;  // referenceNumber
-   marshalSize += 2;  // intercomNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IntercomIdentifier#siteNumber}*/
-public IntercomIdentifier setSiteNumber(short pSiteNumber)
-{
-    siteNumber = pSiteNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomIdentifier#siteNumber}*/
-public short getSiteNumber()
-{
-    return siteNumber; 
-}
-
-/** Setter for {@link IntercomIdentifier#applicationNumber}*/
-public IntercomIdentifier setApplicationNumber(short pApplicationNumber)
-{
-    applicationNumber = pApplicationNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomIdentifier#applicationNumber}*/
-public short getApplicationNumber()
-{
-    return applicationNumber; 
-}
-
-/** Setter for {@link IntercomIdentifier#referenceNumber}*/
-public IntercomIdentifier setReferenceNumber(short pReferenceNumber)
-{
-    referenceNumber = pReferenceNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomIdentifier#referenceNumber}*/
-public short getReferenceNumber()
-{
-    return referenceNumber; 
-}
-
-/** Setter for {@link IntercomIdentifier#intercomNumber}*/
-public IntercomIdentifier setIntercomNumber(short pIntercomNumber)
-{
-    intercomNumber = pIntercomNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomIdentifier#intercomNumber}*/
-public short getIntercomNumber()
-{
-    return intercomNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(siteNumber);
-       dos.writeShort(applicationNumber);
-       dos.writeShort(referenceNumber);
-       dos.writeShort(intercomNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        siteNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        applicationNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        referenceNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        intercomNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)siteNumber);
-   buff.putShort( (short)applicationNumber);
-   buff.putShort( (short)referenceNumber);
-   buff.putShort( (short)intercomNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    siteNumber = (short)(buff.getShort() & 0xFFFF);
-    applicationNumber = (short)(buff.getShort() & 0xFFFF);
-    referenceNumber = (short)(buff.getShort() & 0xFFFF);
-    intercomNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IntercomIdentifier rhs = (IntercomIdentifier)obj;
-
-     if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
-     if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
-     if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
-     if( ! (intercomNumber == rhs.intercomNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" siteNumber: ").append(siteNumber).append("\n");
-    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
-    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-    sb.append(" intercomNumber: ").append(intercomNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
deleted file mode 100644
index 0c818f6dce649957dc9da0ae1e42314d35572ab3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IntercomReferenceID extends Object implements Serializable
-{
-   protected short  siteNumber;
-
-   protected short  applicationNumber;
-
-   protected short  referenceNumber;
-
-
-/** Constructor */
- public IntercomReferenceID()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // siteNumber
-   marshalSize += 2;  // applicationNumber
-   marshalSize += 2;  // referenceNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IntercomReferenceID#siteNumber}*/
-public IntercomReferenceID setSiteNumber(short pSiteNumber)
-{
-    siteNumber = pSiteNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomReferenceID#siteNumber}*/
-public short getSiteNumber()
-{
-    return siteNumber; 
-}
-
-/** Setter for {@link IntercomReferenceID#applicationNumber}*/
-public IntercomReferenceID setApplicationNumber(short pApplicationNumber)
-{
-    applicationNumber = pApplicationNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomReferenceID#applicationNumber}*/
-public short getApplicationNumber()
-{
-    return applicationNumber; 
-}
-
-/** Setter for {@link IntercomReferenceID#referenceNumber}*/
-public IntercomReferenceID setReferenceNumber(short pReferenceNumber)
-{
-    referenceNumber = pReferenceNumber;
-    return this;
-}
-
-/** Getter for {@link IntercomReferenceID#referenceNumber}*/
-public short getReferenceNumber()
-{
-    return referenceNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(siteNumber);
-       dos.writeShort(applicationNumber);
-       dos.writeShort(referenceNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        siteNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        applicationNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        referenceNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)siteNumber);
-   buff.putShort( (short)applicationNumber);
-   buff.putShort( (short)referenceNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    siteNumber = (short)(buff.getShort() & 0xFFFF);
-    applicationNumber = (short)(buff.getShort() & 0xFFFF);
-    referenceNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IntercomReferenceID rhs = (IntercomReferenceID)obj;
-
-     if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
-     if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
-     if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" siteNumber: ").append(siteNumber).append("\n");
-    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
-    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
deleted file mode 100644
index 91f85f90003f7f44081fa5111bd487e407c408f0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-package edu.nps.moves.dis7;
-
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.6 Conveys the audio or digital data that is used to communicate between simulated intercom devices
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
-
-    /**
-     *
-     */
-    protected IntercomReferenceID intercomReferenceID = new IntercomReferenceID();
-
-  /**
-   * ID of communications device
-   */
-  protected short intercomNumber;
-
-  /**
-   * encoding scheme
-   */
-  protected short encodingScheme;
-
-  /**
-   * tactical data link type uid 178
-   */
-  protected SignalTDLType tdlType = SignalTDLType.values()[0];
-
-  /**
-   * sample rate
-   */
-  protected int sampleRate;
-
-  /**
-   * data length
-   */
-  protected Short dataLength;
-
-  /**
-   * samples
-   */
-  protected short samples;
-
-  /**
-   * data bytes
-   */
-  protected byte[] data = new byte[1]; //Wireshark complains if no data 
-
-  private byte[] padTo32 = new byte[0]; // pad to 32-bit boundary
-
-  /**
-   * Constructor
-   */
-  public IntercomSignalPdu()
-  {
-    setPduType(DISPDUType.INTERCOM_SIGNAL);
-  }
-
-  /**
-   * Returns the size of this serialized object in bytes
-   * @return size in bytes
-   */
-  @Override
-  public int getMarshalledSize()
-  {
-    int marshalSize = super.getMarshalledSize();
-    marshalSize += intercomReferenceID.getMarshalledSize();
-    marshalSize += 2;  // intercomNumber
-    marshalSize += 2;  // encodingScheme
-    marshalSize += tdlType.getMarshalledSize();
-    marshalSize += 4;  // sampleRate
-    marshalSize += 2;  // dataLength
-    marshalSize += 2;  // samples
-    marshalSize += data.length;
-    marshalSize += padTo32.length;
-
-    return marshalSize;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#intercomReferenceID}
-   * @param pIntercomReferenceID
-   * @return 
-   */
-  public IntercomSignalPdu setIntercomReferenceID(IntercomReferenceID pIntercomReferenceID)
-  {
-    intercomReferenceID = pIntercomReferenceID;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#intercomReferenceID}
-   * @return 
-   */
-  public IntercomReferenceID getIntercomReferenceID()
-  {
-    return intercomReferenceID;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#intercomNumber}
-   * @param pIntercomNumber
-   * @return 
-   */
-  public IntercomSignalPdu setIntercomNumber(short pIntercomNumber)
-  {
-    intercomNumber = pIntercomNumber;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#intercomNumber}
-   * @return 
-   */
-  public short getIntercomNumber()
-  {
-    return intercomNumber;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#encodingScheme}
-   * @param pEncodingScheme
-   * @return 
-   */
-  public IntercomSignalPdu setEncodingScheme(short pEncodingScheme)
-  {
-    encodingScheme = pEncodingScheme;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#encodingScheme}
-   * @return 
-   */
-  public short getEncodingScheme()
-  {
-    return encodingScheme;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#tdlType}
-   * @param pTdlType
-   * @return 
-   */
-  public IntercomSignalPdu setTdlType(SignalTDLType pTdlType)
-  {
-    tdlType = pTdlType;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#tdlType}
-   * @return 
-   */
-  public SignalTDLType getTdlType()
-  {
-    return tdlType;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#sampleRate}
-   * @param pSampleRate
-   * @return 
-   */
-  public IntercomSignalPdu setSampleRate(int pSampleRate)
-  {
-    sampleRate = pSampleRate;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#sampleRate}
-   * @return 
-   */
-  public int getSampleRate()
-  {
-    return sampleRate;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#dataLength}
-   * <p>
-   * This value is the size IN BITS of the {@link IntercomSignalPdu#dataLength} field. Since that field
-   * is a byte array, its size must be large enough to contain the specified number of bits. If this size is NOT
-   * set and this pdu is issued (marshaled), the value used for this field will be the size of the byte
-   * array times 8.
-   *
-   * @param pDataLength value for field
-   * @return this object
-   */
-  public IntercomSignalPdu setDataLength(short pDataLength)
-  {
-    dataLength = pDataLength;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#dataLength}
-   *
-   * @return value of field
-   */
-  public short getDataLength()
-  {
-    return dataLength;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#samples}
-   * @param pSamples
-   * @return 
-   */
-  public IntercomSignalPdu setSamples(short pSamples)
-  {
-    samples = pSamples;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#samples}
-   * @return 
-   */
-  public short getSamples()
-  {
-    return samples;
-  }
-
-  /**
-   * Setter for {@link IntercomSignalPdu#data}
-   * @param pData
-   * @return 
-   */
-  public IntercomSignalPdu setData(byte[] pData)
-  {
-    data = pData;
-    return this;
-  }
-
-  /**
-   * Getter for {@link IntercomSignalPdu#data}
-   * @return 
-   */
-  public byte[] getData()
-  {
-    return data;
-  }
-
-  /* *************************** */
-  /* Marshal / unmarshal methods */
-  /* *************************** */
-  
-  /**
-   * Serializes an object to a DataOutputStream.
-   *
-     * @throws java.lang.Exception
-   * @see java.io.DataOutputStream
-   * @param dos The DataOutputStream
-   */
-  @Override
-  public void marshal(DataOutputStream dos) throws Exception
-  {
-    super.marshal(dos);
-    try {
-      intercomReferenceID.marshal(dos);
-      dos.writeShort(intercomNumber);
-      dos.writeShort(encodingScheme);
-      tdlType.marshal(dos);
-      dos.writeInt(sampleRate);
-
-      if (dataLength != null)
-        dos.writeShort(dataLength);
-      else
-        dos.writeShort((dataLength = calculateDataLength()));
-
-      dos.writeShort(samples);
-
-      for (int idx = 0; idx < data.length; idx++) {
-        dos.writeByte(data[idx]);
-      }
-
-      padTo32 = new byte[Align.to32bits(dos)];
-    }
-    catch (Exception e) {
-      System.err.println(e);
-    }
-  }
-
-  /**
-   * Unserializes an object from a DataInputStream.
-   *
-   * @throws java.lang.Exception
-   * @see java.io.DataInputStream
-   * @param dis The DataInputStream
-   * @return marshalled size
-   */
-  @Override
-  public int unmarshal(DataInputStream dis) throws Exception
-  {
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    uPosition += intercomReferenceID.unmarshal(dis);
-    intercomNumber = (short) dis.readUnsignedShort();
-    uPosition += 2;
-    encodingScheme = (short) dis.readUnsignedShort();
-    uPosition += 2;
-    tdlType = SignalTDLType.unmarshalEnum(dis);
-    uPosition += tdlType.getMarshalledSize();
-    sampleRate = dis.readInt();
-    uPosition += 4;
-    dataLength = (short) dis.readUnsignedShort();
-    int byteLength = (dataLength + 7) / 8;
-    data = new byte[byteLength];
-    uPosition += 2;
-    samples = (short) dis.readUnsignedShort();
-    uPosition += 2;
-
-    for (int idx = 0; idx < byteLength; idx++) {
-      data[idx] = dis.readByte();
-    }
-
-    uPosition += (data.length * 1);
-    padTo32 = new byte[Align.from32bits(uPosition, dis)];
-    //uPosition += padTo32.length;
-
-    return getMarshalledSize();
-  }
-
-  /**
-   * Packs an object into the ByteBuffer.
-   *
-   * @throws java.nio.BufferOverflowException if buff is too small
-   * @throws java.nio.ReadOnlyBufferException if buff is read only
-   * @see java.nio.ByteBuffer
-   * @param buff The ByteBuffer at the position to begin writing
-   * @throws Exception ByteBuffer-generated exception
-   */
-  @Override
-  public void marshal(java.nio.ByteBuffer buff) throws Exception
-  {
-    super.marshal(buff);
-    intercomReferenceID.marshal(buff);
-    buff.putShort(intercomNumber);
-    buff.putShort(encodingScheme);
-    tdlType.marshal(buff);
-    buff.putInt(sampleRate);
-
-    if (dataLength != null)
-      buff.putShort(dataLength);
-    else
-      buff.putShort((dataLength = calculateDataLength()));
-
-    buff.putShort(samples);
-
-    for (int idx = 0; idx < data.length; idx++) {
-      buff.put(data[idx]);
-    }
-    buff.flip(); // will cause BufferOverflowException if we don't flip here
-    padTo32 = new byte[Align.to32bits(buff)];
-  }
-
-  /**
-   * Unpacks a Pdu from the underlying data.
-   *
-   * @throws java.nio.BufferUnderflowException if buff is too small
-   * @see java.nio.ByteBuffer
-   * @param buff The ByteBuffer at the position to begin reading
-   * @return marshalled size
-   * @throws Exception ByteBuffer-generated exception
-   */
-  @Override
-  public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-  {
-    super.unmarshal(buff);
-
-    intercomReferenceID.unmarshal(buff);
-    intercomNumber = (short) (buff.getShort() & 0xFFFF);
-    encodingScheme = (short) (buff.getShort() & 0xFFFF);
-    tdlType = SignalTDLType.unmarshalEnum(buff);
-    sampleRate = buff.getInt();
-    dataLength = (short) (buff.getShort() & 0xFFFF);
-    int byteLength = (dataLength + 7) / 8;
-    data = new byte[byteLength];
-    samples = (short) (buff.getShort() & 0xFFFF);
-    for (int idx = 0; idx < byteLength; idx++) {
-      data[idx] = buff.get();
-    }
-    buff.flip(); // will cause BufferUnderflowException if we don't flip here
-    padTo32 = new byte[Align.from32bits(buff)];
-    return getMarshalledSize();
-  }
-
-  private short calculateDataLength()
-  {
-    return (short) (data.length * 8);
-  }
-
-  /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-   */
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (this == obj)
-      return true;
-
-    if (obj == null)
-      return false;
-
-    if (getClass() != obj.getClass())
-      return false;
-
-    return equalsImpl(obj);
-  }
-
-  @Override
-  public boolean equalsImpl(Object obj)
-  {
-    boolean ivarsEqual = true;
-
-    final IntercomSignalPdu rhs = (IntercomSignalPdu) obj;
-
-    if (!(intercomReferenceID.equals(rhs.intercomReferenceID)))
-      ivarsEqual = false;
-    if (!(intercomNumber == rhs.intercomNumber))
-      ivarsEqual = false;
-    if (!(encodingScheme == rhs.encodingScheme))
-      ivarsEqual = false;
-    if (!(tdlType == rhs.tdlType))
-      ivarsEqual = false;
-    if (!(sampleRate == rhs.sampleRate))
-      ivarsEqual = false;
-    if (!(dataLength.equals(rhs.dataLength)))
-      ivarsEqual = false;
-    if (!(samples == rhs.samples))
-      ivarsEqual = false;
-
-    for (int idx = 0; idx < 0; idx++) {
-      if (!(data[idx] == rhs.data[idx]))
-        ivarsEqual = false;
-    }
-
-    return ivarsEqual && super.equalsImpl(rhs);
-  }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
deleted file mode 100644
index 8f5054d611f8f0f13e8027d7dfa1e1c54a88a9cc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.9.3.1 The IsGroupOf PDU shall communicate information about the individual states of a group of entities, including state information that is necessary for the receiving simulation applications to represent the issuing group of entities in the simulation applications’ own simulation.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IsGroupOfPdu extends EntityManagementFamilyPdu implements Serializable
-{
-   /** ID of aggregated entities */
-   protected EntityID  groupEntityID = new EntityID(); 
-
-   /** type of entities constituting the group uid 213 */
-   protected IsGroupOfGroupedEntityCategory groupedEntityCategory = IsGroupOfGroupedEntityCategory.values()[0];
-
-   /** Number of individual entities constituting the group */
-   protected byte  numberOfGroupedEntities;
-
-   /** padding */
-   protected int  pad;
-
-   /** latitude */
-   protected double  latitude;
-
-   /** longitude */
-   protected double  longitude;
-
-   /** GED records about each individual entity in the group. Bad specing--the Group Entity Descriptions are not described. */
-   protected List< VariableDatum > groupedEntityDescriptions = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public IsGroupOfPdu()
- {
-    setPduType( DISPDUType.ISGROUPOF );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += groupEntityID.getMarshalledSize();
-   marshalSize += groupedEntityCategory.getMarshalledSize();
-   marshalSize += 1;  // numberOfGroupedEntities
-   marshalSize += 4;  // pad
-   marshalSize += 8;  // latitude
-   marshalSize += 8;  // longitude
-   for(int idx=0; idx < groupedEntityDescriptions.size(); idx++)
-   {
-        VariableDatum listElement = groupedEntityDescriptions.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IsGroupOfPdu#groupEntityID}*/
-public IsGroupOfPdu setGroupEntityID(EntityID pGroupEntityID)
-{
-    groupEntityID = pGroupEntityID;
-    return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#groupEntityID}*/
-public EntityID getGroupEntityID()
-{
-    return groupEntityID; 
-}
-
-/** Setter for {@link IsGroupOfPdu#groupedEntityCategory}*/
-public IsGroupOfPdu setGroupedEntityCategory(IsGroupOfGroupedEntityCategory pGroupedEntityCategory)
-{
-    groupedEntityCategory = pGroupedEntityCategory;
-    return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#groupedEntityCategory}*/
-public IsGroupOfGroupedEntityCategory getGroupedEntityCategory()
-{
-    return groupedEntityCategory; 
-}
-
-/** Setter for {@link IsGroupOfPdu#pad}*/
-public IsGroupOfPdu setPad(int pPad)
-{
-    pad = pPad;
-    return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#pad}*/
-public int getPad()
-{
-    return pad; 
-}
-
-/** Setter for {@link IsGroupOfPdu#latitude}*/
-public IsGroupOfPdu setLatitude(double pLatitude)
-{
-    latitude = pLatitude;
-    return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#latitude}*/
-public double getLatitude()
-{
-    return latitude; 
-}
-
-/** Setter for {@link IsGroupOfPdu#longitude}*/
-public IsGroupOfPdu setLongitude(double pLongitude)
-{
-    longitude = pLongitude;
-    return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#longitude}*/
-public double getLongitude()
-{
-    return longitude; 
-}
-
-/** Setter for {@link IsGroupOfPdu#groupedEntityDescriptions}*/
-public IsGroupOfPdu setGroupedEntityDescriptions(List<VariableDatum> pGroupedEntityDescriptions)
-{
-    groupedEntityDescriptions = pGroupedEntityDescriptions;
-    return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#groupedEntityDescriptions}*/
-public List<VariableDatum> getGroupedEntityDescriptions()
-{
-    return groupedEntityDescriptions; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       groupEntityID.marshal(dos);
-       groupedEntityCategory.marshal(dos);
-       dos.writeByte(groupedEntityDescriptions.size());
-       dos.writeInt(pad);
-       dos.writeDouble(latitude);
-       dos.writeDouble(longitude);
-
-       for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
-       {
-            VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += groupEntityID.unmarshal(dis);
-        groupedEntityCategory = IsGroupOfGroupedEntityCategory.unmarshalEnum(dis);
-        uPosition += groupedEntityCategory.getMarshalledSize();
-        numberOfGroupedEntities = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad = dis.readInt();
-        uPosition += 4;
-        latitude = dis.readDouble();
-        uPosition += 4;
-        longitude = dis.readDouble();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfGroupedEntities; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            groupedEntityDescriptions.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   groupEntityID.marshal(buff);
-   groupedEntityCategory.marshal(buff);
-   buff.put( (byte)groupedEntityDescriptions.size());
-   buff.putInt( (int)pad);
-   buff.putDouble( (double)latitude);
-   buff.putDouble( (double)longitude);
-
-   for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
-   {
-        VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    groupEntityID.unmarshal(buff);
-    groupedEntityCategory = IsGroupOfGroupedEntityCategory.unmarshalEnum(buff);
-    numberOfGroupedEntities = (byte)(buff.get() & 0xFF);
-    pad = buff.getInt();
-    latitude = buff.getDouble();
-    longitude = buff.getDouble();
-    for(int idx = 0; idx < numberOfGroupedEntities; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    groupedEntityDescriptions.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IsGroupOfPdu rhs = (IsGroupOfPdu)obj;
-
-     if( ! (groupEntityID.equals( rhs.groupEntityID) )) ivarsEqual = false;
-     if( ! (groupedEntityCategory == rhs.groupedEntityCategory)) ivarsEqual = false;
-     if( ! (pad == rhs.pad)) ivarsEqual = false;
-     if( ! (latitude == rhs.latitude)) ivarsEqual = false;
-     if( ! (longitude == rhs.longitude)) ivarsEqual = false;
-
-     for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
-        if( ! ( groupedEntityDescriptions.get(idx).equals(rhs.groupedEntityDescriptions.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" groupEntityID: ").append(groupEntityID).append("\n");
-    sb.append(" groupedEntityCategory: ").append(groupedEntityCategory).append("\n");
-    sb.append(" pad: ").append(pad).append("\n");
-    sb.append(" latitude: ").append(latitude).append("\n");
-    sb.append(" longitude: ").append(longitude).append("\n");
-    sb.append(" groupedEntityDescriptions: ").append("\n");
-    groupedEntityDescriptions.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
deleted file mode 100644
index f5d3dc990b11f2c4aa31b408aae23ace3ce49263..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.9.5 Used to request hierarchical linkage of separately hosted simulation entities
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class IsPartOfPdu extends EntityManagementFamilyPdu implements Serializable
-{
-   /** ID of entity originating PDU */
-   protected EntityID  orginatingEntityID = new EntityID(); 
-
-   /** ID of entity receiving PDU */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** relationship of joined parts */
-   protected Relationship  relationship = new Relationship(); 
-
-   /** location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0 */
-   protected Vector3Float  partLocation = new Vector3Float(); 
-
-   /** named location */
-   protected NamedLocationIdentification  namedLocationID = new NamedLocationIdentification(); 
-
-   /** entity type */
-   protected EntityType  partEntityType = new EntityType(); 
-
-
-/** Constructor */
- public IsPartOfPdu()
- {
-    setPduType( DISPDUType.ISPARTOF );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += orginatingEntityID.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += relationship.getMarshalledSize();
-   marshalSize += partLocation.getMarshalledSize();
-   marshalSize += namedLocationID.getMarshalledSize();
-   marshalSize += partEntityType.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link IsPartOfPdu#orginatingEntityID}*/
-public IsPartOfPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
-{
-    orginatingEntityID = pOrginatingEntityID;
-    return this;
-}
-
-/** Getter for {@link IsPartOfPdu#orginatingEntityID}*/
-public EntityID getOrginatingEntityID()
-{
-    return orginatingEntityID; 
-}
-
-/** Setter for {@link IsPartOfPdu#receivingEntityID}*/
-public IsPartOfPdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link IsPartOfPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link IsPartOfPdu#relationship}*/
-public IsPartOfPdu setRelationship(Relationship pRelationship)
-{
-    relationship = pRelationship;
-    return this;
-}
-
-/** Getter for {@link IsPartOfPdu#relationship}*/
-public Relationship getRelationship()
-{
-    return relationship; 
-}
-
-/** Setter for {@link IsPartOfPdu#partLocation}*/
-public IsPartOfPdu setPartLocation(Vector3Float pPartLocation)
-{
-    partLocation = pPartLocation;
-    return this;
-}
-
-/** Getter for {@link IsPartOfPdu#partLocation}*/
-public Vector3Float getPartLocation()
-{
-    return partLocation; 
-}
-
-/** Setter for {@link IsPartOfPdu#namedLocationID}*/
-public IsPartOfPdu setNamedLocationID(NamedLocationIdentification pNamedLocationID)
-{
-    namedLocationID = pNamedLocationID;
-    return this;
-}
-
-/** Getter for {@link IsPartOfPdu#namedLocationID}*/
-public NamedLocationIdentification getNamedLocationID()
-{
-    return namedLocationID; 
-}
-
-/** Setter for {@link IsPartOfPdu#partEntityType}*/
-public IsPartOfPdu setPartEntityType(EntityType pPartEntityType)
-{
-    partEntityType = pPartEntityType;
-    return this;
-}
-
-/** Getter for {@link IsPartOfPdu#partEntityType}*/
-public EntityType getPartEntityType()
-{
-    return partEntityType; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       orginatingEntityID.marshal(dos);
-       receivingEntityID.marshal(dos);
-       relationship.marshal(dos);
-       partLocation.marshal(dos);
-       namedLocationID.marshal(dos);
-       partEntityType.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += orginatingEntityID.unmarshal(dis);
-        uPosition += receivingEntityID.unmarshal(dis);
-        uPosition += relationship.unmarshal(dis);
-        uPosition += partLocation.unmarshal(dis);
-        uPosition += namedLocationID.unmarshal(dis);
-        uPosition += partEntityType.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   orginatingEntityID.marshal(buff);
-   receivingEntityID.marshal(buff);
-   relationship.marshal(buff);
-   partLocation.marshal(buff);
-   namedLocationID.marshal(buff);
-   partEntityType.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    orginatingEntityID.unmarshal(buff);
-    receivingEntityID.unmarshal(buff);
-    relationship.unmarshal(buff);
-    partLocation.unmarshal(buff);
-    namedLocationID.unmarshal(buff);
-    partEntityType.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final IsPartOfPdu rhs = (IsPartOfPdu)obj;
-
-     if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (relationship.equals( rhs.relationship) )) ivarsEqual = false;
-     if( ! (partLocation.equals( rhs.partLocation) )) ivarsEqual = false;
-     if( ! (namedLocationID.equals( rhs.namedLocationID) )) ivarsEqual = false;
-     if( ! (partEntityType.equals( rhs.partEntityType) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" relationship: ").append(relationship).append("\n");
-    sb.append(" partLocation: ").append(partLocation).append("\n");
-    sb.append(" namedLocationID: ").append(namedLocationID).append("\n");
-    sb.append(" partEntityType: ").append(partEntityType).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/JammingTechnique.java b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
deleted file mode 100644
index cae9ffd8a5a9ae8c8cdf0c4323b1dfebb5105b88..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/JammingTechnique.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Jamming technique. Section 6.2.49, uid 284
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class JammingTechnique extends Object implements Serializable
-{
-   protected byte  kind;
-
-   protected byte  category;
-
-   protected byte  subCategory;
-
-   protected byte  specific;
-
-
-/** Constructor */
- public JammingTechnique()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // kind
-   marshalSize += 1;  // category
-   marshalSize += 1;  // subCategory
-   marshalSize += 1;  // specific
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link JammingTechnique#kind}*/
-public JammingTechnique setKind(byte pKind)
-{
-    kind = pKind;
-    return this;
-}
-
-/** Getter for {@link JammingTechnique#kind}*/
-public byte getKind()
-{
-    return kind; 
-}
-
-/** Setter for {@link JammingTechnique#category}*/
-public JammingTechnique setCategory(byte pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link JammingTechnique#category}*/
-public byte getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link JammingTechnique#subCategory}*/
-public JammingTechnique setSubCategory(byte pSubCategory)
-{
-    subCategory = pSubCategory;
-    return this;
-}
-
-/** Getter for {@link JammingTechnique#subCategory}*/
-public byte getSubCategory()
-{
-    return subCategory; 
-}
-
-/** Setter for {@link JammingTechnique#specific}*/
-public JammingTechnique setSpecific(byte pSpecific)
-{
-    specific = pSpecific;
-    return this;
-}
-
-/** Getter for {@link JammingTechnique#specific}*/
-public byte getSpecific()
-{
-    return specific; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(kind);
-       dos.writeByte(category);
-       dos.writeByte(subCategory);
-       dos.writeByte(specific);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        kind = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        category = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        subCategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        specific = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)kind);
-   buff.put( (byte)category);
-   buff.put( (byte)subCategory);
-   buff.put( (byte)specific);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    kind = (byte)(buff.get() & 0xFF);
-    category = (byte)(buff.get() & 0xFF);
-    subCategory = (byte)(buff.get() & 0xFF);
-    specific = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final JammingTechnique rhs = (JammingTechnique)obj;
-
-     if( ! (kind == rhs.kind)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
-     if( ! (specific == rhs.specific)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" kind: ").append(kind).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subCategory: ").append(subCategory).append("\n");
-    sb.append(" specific: ").append(specific).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
deleted file mode 100644
index 102589842766c723d915d56c6bd5e1a9a128ac30..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.6 Communicate information associated with the impact or detonation of a munition.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LEDetonationPdu extends LiveEntityFamilyPdu implements Serializable
-{
-   protected EntityID  firingLiveEntityId = new EntityID(); 
-
-   protected byte  detonationFlag1;
-
-   protected byte  detonationFlag2;
-
-   protected EntityID  targetLiveEntityId = new EntityID(); 
-
-   protected EntityID  munitionLiveEntityId = new EntityID(); 
-
-   protected EventIdentifier  eventId = new EventIdentifier(); 
-
-   protected LiveEntityRelativeWorldCoordinates  worldLocation = new LiveEntityRelativeWorldCoordinates(); 
-
-   protected LiveEntityLinearVelocity  velocity = new LiveEntityLinearVelocity(); 
-
-   /** spec error? 16-bit fields vs. 8-bit in TspiPdu? */
-   protected LiveEntityOrientation16  munitionOrientation = new LiveEntityOrientation16(); 
-
-   protected MunitionDescriptor  munitionDescriptor = new MunitionDescriptor(); 
-
-   protected LiveEntityLinearVelocity  entityLocation = new LiveEntityLinearVelocity(); 
-
-   protected byte  detonationResult;
-
-
-/** Constructor */
- public LEDetonationPdu()
- {
-    setPduType( DISPDUType.LIVE_ENTITY_DETONATION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += firingLiveEntityId.getMarshalledSize();
-   marshalSize += 1;  // detonationFlag1
-   marshalSize += 1;  // detonationFlag2
-   marshalSize += targetLiveEntityId.getMarshalledSize();
-   marshalSize += munitionLiveEntityId.getMarshalledSize();
-   marshalSize += eventId.getMarshalledSize();
-   marshalSize += worldLocation.getMarshalledSize();
-   marshalSize += velocity.getMarshalledSize();
-   marshalSize += munitionOrientation.getMarshalledSize();
-   marshalSize += munitionDescriptor.getMarshalledSize();
-   marshalSize += entityLocation.getMarshalledSize();
-   marshalSize += 1;  // detonationResult
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LEDetonationPdu#firingLiveEntityId}*/
-public LEDetonationPdu setFiringLiveEntityId(EntityID pFiringLiveEntityId)
-{
-    firingLiveEntityId = pFiringLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#firingLiveEntityId}*/
-public EntityID getFiringLiveEntityId()
-{
-    return firingLiveEntityId; 
-}
-
-/** Setter for {@link LEDetonationPdu#detonationFlag1}*/
-public LEDetonationPdu setDetonationFlag1(byte pDetonationFlag1)
-{
-    detonationFlag1 = pDetonationFlag1;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#detonationFlag1}*/
-public byte getDetonationFlag1()
-{
-    return detonationFlag1; 
-}
-
-/** Setter for {@link LEDetonationPdu#detonationFlag2}*/
-public LEDetonationPdu setDetonationFlag2(byte pDetonationFlag2)
-{
-    detonationFlag2 = pDetonationFlag2;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#detonationFlag2}*/
-public byte getDetonationFlag2()
-{
-    return detonationFlag2; 
-}
-
-/** Setter for {@link LEDetonationPdu#targetLiveEntityId}*/
-public LEDetonationPdu setTargetLiveEntityId(EntityID pTargetLiveEntityId)
-{
-    targetLiveEntityId = pTargetLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#targetLiveEntityId}*/
-public EntityID getTargetLiveEntityId()
-{
-    return targetLiveEntityId; 
-}
-
-/** Setter for {@link LEDetonationPdu#munitionLiveEntityId}*/
-public LEDetonationPdu setMunitionLiveEntityId(EntityID pMunitionLiveEntityId)
-{
-    munitionLiveEntityId = pMunitionLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#munitionLiveEntityId}*/
-public EntityID getMunitionLiveEntityId()
-{
-    return munitionLiveEntityId; 
-}
-
-/** Setter for {@link LEDetonationPdu#eventId}*/
-public LEDetonationPdu setEventId(EventIdentifier pEventId)
-{
-    eventId = pEventId;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#eventId}*/
-public EventIdentifier getEventId()
-{
-    return eventId; 
-}
-
-/** Setter for {@link LEDetonationPdu#worldLocation}*/
-public LEDetonationPdu setWorldLocation(LiveEntityRelativeWorldCoordinates pWorldLocation)
-{
-    worldLocation = pWorldLocation;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#worldLocation}*/
-public LiveEntityRelativeWorldCoordinates getWorldLocation()
-{
-    return worldLocation; 
-}
-
-/** Setter for {@link LEDetonationPdu#velocity}*/
-public LEDetonationPdu setVelocity(LiveEntityLinearVelocity pVelocity)
-{
-    velocity = pVelocity;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#velocity}*/
-public LiveEntityLinearVelocity getVelocity()
-{
-    return velocity; 
-}
-
-/** Setter for {@link LEDetonationPdu#munitionOrientation}*/
-public LEDetonationPdu setMunitionOrientation(LiveEntityOrientation16 pMunitionOrientation)
-{
-    munitionOrientation = pMunitionOrientation;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#munitionOrientation}*/
-public LiveEntityOrientation16 getMunitionOrientation()
-{
-    return munitionOrientation; 
-}
-
-/** Setter for {@link LEDetonationPdu#munitionDescriptor}*/
-public LEDetonationPdu setMunitionDescriptor(MunitionDescriptor pMunitionDescriptor)
-{
-    munitionDescriptor = pMunitionDescriptor;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#munitionDescriptor}*/
-public MunitionDescriptor getMunitionDescriptor()
-{
-    return munitionDescriptor; 
-}
-
-/** Setter for {@link LEDetonationPdu#entityLocation}*/
-public LEDetonationPdu setEntityLocation(LiveEntityLinearVelocity pEntityLocation)
-{
-    entityLocation = pEntityLocation;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#entityLocation}*/
-public LiveEntityLinearVelocity getEntityLocation()
-{
-    return entityLocation; 
-}
-
-/** Setter for {@link LEDetonationPdu#detonationResult}*/
-public LEDetonationPdu setDetonationResult(byte pDetonationResult)
-{
-    detonationResult = pDetonationResult;
-    return this;
-}
-
-/** Getter for {@link LEDetonationPdu#detonationResult}*/
-public byte getDetonationResult()
-{
-    return detonationResult; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       firingLiveEntityId.marshal(dos);
-       dos.writeByte(detonationFlag1);
-       dos.writeByte(detonationFlag2);
-       targetLiveEntityId.marshal(dos);
-       munitionLiveEntityId.marshal(dos);
-       eventId.marshal(dos);
-       worldLocation.marshal(dos);
-       velocity.marshal(dos);
-       munitionOrientation.marshal(dos);
-       munitionDescriptor.marshal(dos);
-       entityLocation.marshal(dos);
-       dos.writeByte(detonationResult);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += firingLiveEntityId.unmarshal(dis);
-        detonationFlag1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        detonationFlag2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += targetLiveEntityId.unmarshal(dis);
-        uPosition += munitionLiveEntityId.unmarshal(dis);
-        uPosition += eventId.unmarshal(dis);
-        uPosition += worldLocation.unmarshal(dis);
-        uPosition += velocity.unmarshal(dis);
-        uPosition += munitionOrientation.unmarshal(dis);
-        uPosition += munitionDescriptor.unmarshal(dis);
-        uPosition += entityLocation.unmarshal(dis);
-        detonationResult = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   firingLiveEntityId.marshal(buff);
-   buff.put( (byte)detonationFlag1);
-   buff.put( (byte)detonationFlag2);
-   targetLiveEntityId.marshal(buff);
-   munitionLiveEntityId.marshal(buff);
-   eventId.marshal(buff);
-   worldLocation.marshal(buff);
-   velocity.marshal(buff);
-   munitionOrientation.marshal(buff);
-   munitionDescriptor.marshal(buff);
-   entityLocation.marshal(buff);
-   buff.put( (byte)detonationResult);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    firingLiveEntityId.unmarshal(buff);
-    detonationFlag1 = (byte)(buff.get() & 0xFF);
-    detonationFlag2 = (byte)(buff.get() & 0xFF);
-    targetLiveEntityId.unmarshal(buff);
-    munitionLiveEntityId.unmarshal(buff);
-    eventId.unmarshal(buff);
-    worldLocation.unmarshal(buff);
-    velocity.unmarshal(buff);
-    munitionOrientation.unmarshal(buff);
-    munitionDescriptor.unmarshal(buff);
-    entityLocation.unmarshal(buff);
-    detonationResult = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LEDetonationPdu rhs = (LEDetonationPdu)obj;
-
-     if( ! (firingLiveEntityId.equals( rhs.firingLiveEntityId) )) ivarsEqual = false;
-     if( ! (detonationFlag1 == rhs.detonationFlag1)) ivarsEqual = false;
-     if( ! (detonationFlag2 == rhs.detonationFlag2)) ivarsEqual = false;
-     if( ! (targetLiveEntityId.equals( rhs.targetLiveEntityId) )) ivarsEqual = false;
-     if( ! (munitionLiveEntityId.equals( rhs.munitionLiveEntityId) )) ivarsEqual = false;
-     if( ! (eventId.equals( rhs.eventId) )) ivarsEqual = false;
-     if( ! (worldLocation.equals( rhs.worldLocation) )) ivarsEqual = false;
-     if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-     if( ! (munitionOrientation.equals( rhs.munitionOrientation) )) ivarsEqual = false;
-     if( ! (munitionDescriptor.equals( rhs.munitionDescriptor) )) ivarsEqual = false;
-     if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
-     if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
-    sb.append(" detonationFlag1: ").append(detonationFlag1).append("\n");
-    sb.append(" detonationFlag2: ").append(detonationFlag2).append("\n");
-    sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
-    sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
-    sb.append(" eventId: ").append(eventId).append("\n");
-    sb.append(" worldLocation: ").append(worldLocation).append("\n");
-    sb.append(" velocity: ").append(velocity).append("\n");
-    sb.append(" munitionOrientation: ").append(munitionOrientation).append("\n");
-    sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
-    sb.append(" entityLocation: ").append(entityLocation).append("\n");
-    sb.append(" detonationResult: ").append(detonationResult).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
deleted file mode 100644
index 3ddca21f04fb2dae3f44266e5d048a41a031c131..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LEFirePdu.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.5 Representation of weapons fire in a DIS exercise involving LEs.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LEFirePdu extends LiveEntityFamilyPdu implements Serializable
-{
-   protected EntityID  firingLiveEntityId = new EntityID(); 
-
-   /** Bits defined in IEEE Standard */
-   protected byte  flags;
-
-   protected EntityID  targetLiveEntityId = new EntityID(); 
-
-   protected EntityID  munitionLiveEntityId = new EntityID(); 
-
-   protected EventIdentifier  eventId = new EventIdentifier(); 
-
-   protected LiveEntityRelativeWorldCoordinates  location = new LiveEntityRelativeWorldCoordinates(); 
-
-   protected MunitionDescriptor  munitionDescriptor = new MunitionDescriptor(); 
-
-   protected LiveEntityLinearVelocity  velocity = new LiveEntityLinearVelocity(); 
-
-   protected short  range;
-
-
-/** Constructor */
- public LEFirePdu()
- {
-    setPduType( DISPDUType.LIVE_ENTITY_FIRE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += firingLiveEntityId.getMarshalledSize();
-   marshalSize += 1;  // flags
-   marshalSize += targetLiveEntityId.getMarshalledSize();
-   marshalSize += munitionLiveEntityId.getMarshalledSize();
-   marshalSize += eventId.getMarshalledSize();
-   marshalSize += location.getMarshalledSize();
-   marshalSize += munitionDescriptor.getMarshalledSize();
-   marshalSize += velocity.getMarshalledSize();
-   marshalSize += 2;  // range
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LEFirePdu#firingLiveEntityId}*/
-public LEFirePdu setFiringLiveEntityId(EntityID pFiringLiveEntityId)
-{
-    firingLiveEntityId = pFiringLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#firingLiveEntityId}*/
-public EntityID getFiringLiveEntityId()
-{
-    return firingLiveEntityId; 
-}
-
-/** Setter for {@link LEFirePdu#flags}*/
-public LEFirePdu setFlags(byte pFlags)
-{
-    flags = pFlags;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#flags}*/
-public byte getFlags()
-{
-    return flags; 
-}
-
-/** Setter for {@link LEFirePdu#targetLiveEntityId}*/
-public LEFirePdu setTargetLiveEntityId(EntityID pTargetLiveEntityId)
-{
-    targetLiveEntityId = pTargetLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#targetLiveEntityId}*/
-public EntityID getTargetLiveEntityId()
-{
-    return targetLiveEntityId; 
-}
-
-/** Setter for {@link LEFirePdu#munitionLiveEntityId}*/
-public LEFirePdu setMunitionLiveEntityId(EntityID pMunitionLiveEntityId)
-{
-    munitionLiveEntityId = pMunitionLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#munitionLiveEntityId}*/
-public EntityID getMunitionLiveEntityId()
-{
-    return munitionLiveEntityId; 
-}
-
-/** Setter for {@link LEFirePdu#eventId}*/
-public LEFirePdu setEventId(EventIdentifier pEventId)
-{
-    eventId = pEventId;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#eventId}*/
-public EventIdentifier getEventId()
-{
-    return eventId; 
-}
-
-/** Setter for {@link LEFirePdu#location}*/
-public LEFirePdu setLocation(LiveEntityRelativeWorldCoordinates pLocation)
-{
-    location = pLocation;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#location}*/
-public LiveEntityRelativeWorldCoordinates getLocation()
-{
-    return location; 
-}
-
-/** Setter for {@link LEFirePdu#munitionDescriptor}*/
-public LEFirePdu setMunitionDescriptor(MunitionDescriptor pMunitionDescriptor)
-{
-    munitionDescriptor = pMunitionDescriptor;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#munitionDescriptor}*/
-public MunitionDescriptor getMunitionDescriptor()
-{
-    return munitionDescriptor; 
-}
-
-/** Setter for {@link LEFirePdu#velocity}*/
-public LEFirePdu setVelocity(LiveEntityLinearVelocity pVelocity)
-{
-    velocity = pVelocity;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#velocity}*/
-public LiveEntityLinearVelocity getVelocity()
-{
-    return velocity; 
-}
-
-/** Setter for {@link LEFirePdu#range}*/
-public LEFirePdu setRange(short pRange)
-{
-    range = pRange;
-    return this;
-}
-
-/** Getter for {@link LEFirePdu#range}*/
-public short getRange()
-{
-    return range; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       firingLiveEntityId.marshal(dos);
-       dos.writeByte(flags);
-       targetLiveEntityId.marshal(dos);
-       munitionLiveEntityId.marshal(dos);
-       eventId.marshal(dos);
-       location.marshal(dos);
-       munitionDescriptor.marshal(dos);
-       velocity.marshal(dos);
-       dos.writeShort(range);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += firingLiveEntityId.unmarshal(dis);
-        flags = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += targetLiveEntityId.unmarshal(dis);
-        uPosition += munitionLiveEntityId.unmarshal(dis);
-        uPosition += eventId.unmarshal(dis);
-        uPosition += location.unmarshal(dis);
-        uPosition += munitionDescriptor.unmarshal(dis);
-        uPosition += velocity.unmarshal(dis);
-        range = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   firingLiveEntityId.marshal(buff);
-   buff.put( (byte)flags);
-   targetLiveEntityId.marshal(buff);
-   munitionLiveEntityId.marshal(buff);
-   eventId.marshal(buff);
-   location.marshal(buff);
-   munitionDescriptor.marshal(buff);
-   velocity.marshal(buff);
-   buff.putShort( (short)range);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    firingLiveEntityId.unmarshal(buff);
-    flags = (byte)(buff.get() & 0xFF);
-    targetLiveEntityId.unmarshal(buff);
-    munitionLiveEntityId.unmarshal(buff);
-    eventId.unmarshal(buff);
-    location.unmarshal(buff);
-    munitionDescriptor.unmarshal(buff);
-    velocity.unmarshal(buff);
-    range = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LEFirePdu rhs = (LEFirePdu)obj;
-
-     if( ! (firingLiveEntityId.equals( rhs.firingLiveEntityId) )) ivarsEqual = false;
-     if( ! (flags == rhs.flags)) ivarsEqual = false;
-     if( ! (targetLiveEntityId.equals( rhs.targetLiveEntityId) )) ivarsEqual = false;
-     if( ! (munitionLiveEntityId.equals( rhs.munitionLiveEntityId) )) ivarsEqual = false;
-     if( ! (eventId.equals( rhs.eventId) )) ivarsEqual = false;
-     if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-     if( ! (munitionDescriptor.equals( rhs.munitionDescriptor) )) ivarsEqual = false;
-     if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-     if( ! (range == rhs.range)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
-    sb.append(" flags: ").append(flags).append("\n");
-    sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
-    sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
-    sb.append(" eventId: ").append(eventId).append("\n");
-    sb.append(" location: ").append(location).append("\n");
-    sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
-    sb.append(" velocity: ").append(velocity).append("\n");
-    sb.append(" range: ").append(range).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
deleted file mode 100644
index ef727ddf8ab76e8b9e1903da3cff46619854516a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 3 x 8-bit fixed binary
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LEVector3FixedByte extends Object implements Serializable
-{
-   /** X value */
-   protected byte  x;
-
-   /** y Value */
-   protected byte  y;
-
-   /** Z value */
-   protected byte  z;
-
-
-/** Constructor */
- public LEVector3FixedByte()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // x
-   marshalSize += 1;  // y
-   marshalSize += 1;  // z
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LEVector3FixedByte#x}*/
-public LEVector3FixedByte setX(byte pX)
-{
-    x = pX;
-    return this;
-}
-
-/** Getter for {@link LEVector3FixedByte#x}*/
-public byte getX()
-{
-    return x; 
-}
-
-/** Setter for {@link LEVector3FixedByte#y}*/
-public LEVector3FixedByte setY(byte pY)
-{
-    y = pY;
-    return this;
-}
-
-/** Getter for {@link LEVector3FixedByte#y}*/
-public byte getY()
-{
-    return y; 
-}
-
-/** Setter for {@link LEVector3FixedByte#z}*/
-public LEVector3FixedByte setZ(byte pZ)
-{
-    z = pZ;
-    return this;
-}
-
-/** Getter for {@link LEVector3FixedByte#z}*/
-public byte getZ()
-{
-    return z; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(x);
-       dos.writeByte(y);
-       dos.writeByte(z);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        x = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        y = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        z = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)x);
-   buff.put( (byte)y);
-   buff.put( (byte)z);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    x = (byte)(buff.get() & 0xFF);
-    y = (byte)(buff.get() & 0xFF);
-    z = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LEVector3FixedByte rhs = (LEVector3FixedByte)obj;
-
-     if( ! (x == rhs.x)) ivarsEqual = false;
-     if( ! (y == rhs.y)) ivarsEqual = false;
-     if( ! (z == rhs.z)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" x: ").append(x).append("\n");
-    sb.append(" y: ").append(y).append("\n");
-    sb.append(" z: ").append(z).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
deleted file mode 100644
index 037f248b8a9e4fb475f3c929e08d2ae7ed255f69..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identity of a communications node. Section 6.2.50
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LaunchedMunitionRecord extends Object implements Serializable
-{
-   protected EventIdentifier  fireEventID = new EventIdentifier(); 
-
-   protected short  padding;
-
-   protected EntityID  firingEntityID = new EntityID(); 
-
-   protected short  padding2;
-
-   protected EntityID  targetEntityID = new EntityID(); 
-
-   protected short  padding3;
-
-   protected Vector3Double  targetLocation = new Vector3Double(); 
-
-
-/** Constructor */
- public LaunchedMunitionRecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += fireEventID.getMarshalledSize();
-   marshalSize += 2;  // padding
-   marshalSize += firingEntityID.getMarshalledSize();
-   marshalSize += 2;  // padding2
-   marshalSize += targetEntityID.getMarshalledSize();
-   marshalSize += 2;  // padding3
-   marshalSize += targetLocation.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LaunchedMunitionRecord#fireEventID}*/
-public LaunchedMunitionRecord setFireEventID(EventIdentifier pFireEventID)
-{
-    fireEventID = pFireEventID;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#fireEventID}*/
-public EventIdentifier getFireEventID()
-{
-    return fireEventID; 
-}
-
-/** Setter for {@link LaunchedMunitionRecord#padding}*/
-public LaunchedMunitionRecord setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link LaunchedMunitionRecord#firingEntityID}*/
-public LaunchedMunitionRecord setFiringEntityID(EntityID pFiringEntityID)
-{
-    firingEntityID = pFiringEntityID;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#firingEntityID}*/
-public EntityID getFiringEntityID()
-{
-    return firingEntityID; 
-}
-
-/** Setter for {@link LaunchedMunitionRecord#padding2}*/
-public LaunchedMunitionRecord setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link LaunchedMunitionRecord#targetEntityID}*/
-public LaunchedMunitionRecord setTargetEntityID(EntityID pTargetEntityID)
-{
-    targetEntityID = pTargetEntityID;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#targetEntityID}*/
-public EntityID getTargetEntityID()
-{
-    return targetEntityID; 
-}
-
-/** Setter for {@link LaunchedMunitionRecord#padding3}*/
-public LaunchedMunitionRecord setPadding3(short pPadding3)
-{
-    padding3 = pPadding3;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#padding3}*/
-public short getPadding3()
-{
-    return padding3; 
-}
-
-/** Setter for {@link LaunchedMunitionRecord#targetLocation}*/
-public LaunchedMunitionRecord setTargetLocation(Vector3Double pTargetLocation)
-{
-    targetLocation = pTargetLocation;
-    return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#targetLocation}*/
-public Vector3Double getTargetLocation()
-{
-    return targetLocation; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       fireEventID.marshal(dos);
-       dos.writeShort(padding);
-       firingEntityID.marshal(dos);
-       dos.writeShort(padding2);
-       targetEntityID.marshal(dos);
-       dos.writeShort(padding3);
-       targetLocation.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += fireEventID.unmarshal(dis);
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += firingEntityID.unmarshal(dis);
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += targetEntityID.unmarshal(dis);
-        padding3 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += targetLocation.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   fireEventID.marshal(buff);
-   buff.putShort( (short)padding);
-   firingEntityID.marshal(buff);
-   buff.putShort( (short)padding2);
-   targetEntityID.marshal(buff);
-   buff.putShort( (short)padding3);
-   targetLocation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    fireEventID.unmarshal(buff);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    firingEntityID.unmarshal(buff);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    targetEntityID.unmarshal(buff);
-    padding3 = (short)(buff.getShort() & 0xFFFF);
-    targetLocation.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LaunchedMunitionRecord rhs = (LaunchedMunitionRecord)obj;
-
-     if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
-     if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-     if( ! (targetLocation.equals( rhs.targetLocation) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fireEventID: ").append(fireEventID).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
-    sb.append(" padding3: ").append(padding3).append("\n");
-    sb.append(" targetLocation: ").append(targetLocation).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LayerHeader.java b/src-generated/edu/nps/moves/dis7/LayerHeader.java
deleted file mode 100644
index c50cf9f069377811e922fb2e271e549c8fbb868f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LayerHeader.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.51
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LayerHeader extends Object implements Serializable
-{
-   protected byte  layerNumber;
-
-   /** field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number. */
-   protected byte  layerSpecificInformation;
-
-   /** This field shall specify the length in octets of the layer, including the Layer Header record */
-   protected short  length;
-
-
-/** Constructor */
- public LayerHeader()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // layerNumber
-   marshalSize += 1;  // layerSpecificInformation
-   marshalSize += 2;  // length
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LayerHeader#layerNumber}*/
-public LayerHeader setLayerNumber(byte pLayerNumber)
-{
-    layerNumber = pLayerNumber;
-    return this;
-}
-
-/** Getter for {@link LayerHeader#layerNumber}*/
-public byte getLayerNumber()
-{
-    return layerNumber; 
-}
-
-/** Setter for {@link LayerHeader#layerSpecificInformation}*/
-public LayerHeader setLayerSpecificInformation(byte pLayerSpecificInformation)
-{
-    layerSpecificInformation = pLayerSpecificInformation;
-    return this;
-}
-
-/** Getter for {@link LayerHeader#layerSpecificInformation}*/
-public byte getLayerSpecificInformation()
-{
-    return layerSpecificInformation; 
-}
-
-/** Setter for {@link LayerHeader#length}*/
-public LayerHeader setLength(short pLength)
-{
-    length = pLength;
-    return this;
-}
-
-/** Getter for {@link LayerHeader#length}*/
-public short getLength()
-{
-    return length; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(layerNumber);
-       dos.writeByte(layerSpecificInformation);
-       dos.writeShort(length);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        layerNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        layerSpecificInformation = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        length = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)layerNumber);
-   buff.put( (byte)layerSpecificInformation);
-   buff.putShort( (short)length);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    layerNumber = (byte)(buff.get() & 0xFF);
-    layerSpecificInformation = (byte)(buff.get() & 0xFF);
-    length = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LayerHeader rhs = (LayerHeader)obj;
-
-     if( ! (layerNumber == rhs.layerNumber)) ivarsEqual = false;
-     if( ! (layerSpecificInformation == rhs.layerSpecificInformation)) ivarsEqual = false;
-     if( ! (length == rhs.length)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" layerNumber: ").append(layerNumber).append("\n");
-    sb.append(" layerSpecificInformation: ").append(layerSpecificInformation).append("\n");
-    sb.append(" length: ").append(length).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
deleted file mode 100644
index 4aabd097f66265e71c6574f9829ac8bae3fdc9d9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.5 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with one point and has size and orientation.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LinearObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
-   /** Object in synthetic environment */
-   protected ObjectIdentifier  objectID = new ObjectIdentifier(); 
-
-   /** Object with which this point object is associated */
-   protected ObjectIdentifier  referencedObjectID = new ObjectIdentifier(); 
-
-   /** unique update number of each state transition of an object */
-   protected short  updateNumber;
-
-   /** force ID uid 6 */
-   protected ForceID forceID = ForceID.values()[0];
-
-   /** number of linear segment parameters */
-   protected byte  numberOfLinearSegments;
-
-   /** requesterID */
-   protected SimulationAddress  requesterID = new SimulationAddress(); 
-
-   /** receiver ID */
-   protected SimulationAddress  receivingID = new SimulationAddress(); 
-
-   /** Object type */
-   protected ObjectType  objectType = new ObjectType(); 
-
-   /** Linear segment parameters */
-   protected List< LinearSegmentParameter > linearSegmentParameters = new ArrayList< LinearSegmentParameter >();
- 
-
-/** Constructor */
- public LinearObjectStatePdu()
- {
-    setPduType( DISPDUType.LINEAR_OBJECT_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += objectID.getMarshalledSize();
-   marshalSize += referencedObjectID.getMarshalledSize();
-   marshalSize += 2;  // updateNumber
-   marshalSize += forceID.getMarshalledSize();
-   marshalSize += 1;  // numberOfLinearSegments
-   marshalSize += requesterID.getMarshalledSize();
-   marshalSize += receivingID.getMarshalledSize();
-   marshalSize += objectType.getMarshalledSize();
-   for(int idx=0; idx < linearSegmentParameters.size(); idx++)
-   {
-        LinearSegmentParameter listElement = linearSegmentParameters.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LinearObjectStatePdu#objectID}*/
-public LinearObjectStatePdu setObjectID(ObjectIdentifier pObjectID)
-{
-    objectID = pObjectID;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#objectID}*/
-public ObjectIdentifier getObjectID()
-{
-    return objectID; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#referencedObjectID}*/
-public LinearObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
-{
-    referencedObjectID = pReferencedObjectID;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#referencedObjectID}*/
-public ObjectIdentifier getReferencedObjectID()
-{
-    return referencedObjectID; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#updateNumber}*/
-public LinearObjectStatePdu setUpdateNumber(short pUpdateNumber)
-{
-    updateNumber = pUpdateNumber;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#updateNumber}*/
-public short getUpdateNumber()
-{
-    return updateNumber; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#forceID}*/
-public LinearObjectStatePdu setForceID(ForceID pForceID)
-{
-    forceID = pForceID;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#forceID}*/
-public ForceID getForceID()
-{
-    return forceID; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#requesterID}*/
-public LinearObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
-{
-    requesterID = pRequesterID;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#requesterID}*/
-public SimulationAddress getRequesterID()
-{
-    return requesterID; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#receivingID}*/
-public LinearObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
-{
-    receivingID = pReceivingID;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#receivingID}*/
-public SimulationAddress getReceivingID()
-{
-    return receivingID; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#objectType}*/
-public LinearObjectStatePdu setObjectType(ObjectType pObjectType)
-{
-    objectType = pObjectType;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#objectType}*/
-public ObjectType getObjectType()
-{
-    return objectType; 
-}
-
-/** Setter for {@link LinearObjectStatePdu#linearSegmentParameters}*/
-public LinearObjectStatePdu setLinearSegmentParameters(List<LinearSegmentParameter> pLinearSegmentParameters)
-{
-    linearSegmentParameters = pLinearSegmentParameters;
-    return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#linearSegmentParameters}*/
-public List<LinearSegmentParameter> getLinearSegmentParameters()
-{
-    return linearSegmentParameters; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       objectID.marshal(dos);
-       referencedObjectID.marshal(dos);
-       dos.writeShort(updateNumber);
-       forceID.marshal(dos);
-       dos.writeByte(linearSegmentParameters.size());
-       requesterID.marshal(dos);
-       receivingID.marshal(dos);
-       objectType.marshal(dos);
-
-       for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
-       {
-            LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
-            aLinearSegmentParameter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += objectID.unmarshal(dis);
-        uPosition += referencedObjectID.unmarshal(dis);
-        updateNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        forceID = ForceID.unmarshalEnum(dis);
-        uPosition += forceID.getMarshalledSize();
-        numberOfLinearSegments = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += requesterID.unmarshal(dis);
-        uPosition += receivingID.unmarshal(dis);
-        uPosition += objectType.unmarshal(dis);
-        for(int idx = 0; idx < numberOfLinearSegments; idx++)
-        {
-            LinearSegmentParameter anX = new LinearSegmentParameter();
-            uPosition += anX.unmarshal(dis);
-            linearSegmentParameters.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   objectID.marshal(buff);
-   referencedObjectID.marshal(buff);
-   buff.putShort( (short)updateNumber);
-   forceID.marshal(buff);
-   buff.put( (byte)linearSegmentParameters.size());
-   requesterID.marshal(buff);
-   receivingID.marshal(buff);
-   objectType.marshal(buff);
-
-   for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
-   {
-        LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
-        aLinearSegmentParameter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    objectID.unmarshal(buff);
-    referencedObjectID.unmarshal(buff);
-    updateNumber = (short)(buff.getShort() & 0xFFFF);
-    forceID = ForceID.unmarshalEnum(buff);
-    numberOfLinearSegments = (byte)(buff.get() & 0xFF);
-    requesterID.unmarshal(buff);
-    receivingID.unmarshal(buff);
-    objectType.unmarshal(buff);
-    for(int idx = 0; idx < numberOfLinearSegments; idx++)
-    {
-    LinearSegmentParameter anX = new LinearSegmentParameter();
-    anX.unmarshal(buff);
-    linearSegmentParameters.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LinearObjectStatePdu rhs = (LinearObjectStatePdu)obj;
-
-     if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
-     if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
-     if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
-     if( ! (forceID == rhs.forceID)) ivarsEqual = false;
-     if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
-     if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
-     if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
-        if( ! ( linearSegmentParameters.get(idx).equals(rhs.linearSegmentParameters.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" objectID: ").append(objectID).append("\n");
-    sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
-    sb.append(" updateNumber: ").append(updateNumber).append("\n");
-    sb.append(" forceID: ").append(forceID).append("\n");
-    sb.append(" requesterID: ").append(requesterID).append("\n");
-    sb.append(" receivingID: ").append(receivingID).append("\n");
-    sb.append(" objectType: ").append(objectType).append("\n");
-    sb.append(" linearSegmentParameters: ").append("\n");
-    linearSegmentParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
deleted file mode 100644
index 5c8c2467182c7177ca83eaa08bbf09adb2ef5c20..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.52
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LinearSegmentParameter extends Object implements Serializable
-{
-   /** the individual segment of the linear segment */
-   protected byte  segmentNumber;
-
-   /**  whether a modification has been made to the point object's location or orientation UID 241 */
-   protected ObjectStateModificationLinearObject segmentModification = new ObjectStateModificationLinearObject();
-
-   /** general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010. UID 229 */
-   protected ObjectStateAppearanceGeneral generalSegmentAppearance = new ObjectStateAppearanceGeneral();
-
-   /** This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations. */
-   protected int  specificSegmentAppearance;
-
-   /** This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record  */
-   protected Vector3Double  segmentLocation = new Vector3Double(); 
-
-   /** orientation of the linear segment about the segment location and shall be represented by a Euler Angles record  */
-   protected EulerAngles  segmentOrientation = new EulerAngles(); 
-
-   /** length of the linear segment, in meters, extending in the positive X direction */
-   protected float  segmentLength;
-
-   /** The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction. */
-   protected float  segmentWidth;
-
-   /** The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer. */
-   protected float  segmentHeight;
-
-   /** The depth of the linear segment, in meters, below ground level  */
-   protected float  segmentDepth;
-
-   /** padding */
-   protected int  padding;
-
-
-/** Constructor */
- public LinearSegmentParameter()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // segmentNumber
-   marshalSize += segmentModification.getMarshalledSize();
-   marshalSize += generalSegmentAppearance.getMarshalledSize();
-   marshalSize += 4;  // specificSegmentAppearance
-   marshalSize += segmentLocation.getMarshalledSize();
-   marshalSize += segmentOrientation.getMarshalledSize();
-   marshalSize += 4;  // segmentLength
-   marshalSize += 4;  // segmentWidth
-   marshalSize += 4;  // segmentHeight
-   marshalSize += 4;  // segmentDepth
-   marshalSize += 4;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LinearSegmentParameter#segmentNumber}*/
-public LinearSegmentParameter setSegmentNumber(byte pSegmentNumber)
-{
-    segmentNumber = pSegmentNumber;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentNumber}*/
-public byte getSegmentNumber()
-{
-    return segmentNumber; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentModification}*/
-public LinearSegmentParameter setSegmentModification(ObjectStateModificationLinearObject pSegmentModification)
-{
-    segmentModification = pSegmentModification;
-    return this;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentModification}*/
-public ObjectStateModificationLinearObject getSegmentModification()
-{
-    return segmentModification; 
-}
-
-/** Setter for {@link LinearSegmentParameter#generalSegmentAppearance}*/
-public LinearSegmentParameter setGeneralSegmentAppearance(ObjectStateAppearanceGeneral pGeneralSegmentAppearance)
-{
-    generalSegmentAppearance = pGeneralSegmentAppearance;
-    return this;
-}
-
-/** Setter for {@link LinearSegmentParameter#generalSegmentAppearance}*/
-public ObjectStateAppearanceGeneral getGeneralSegmentAppearance()
-{
-    return generalSegmentAppearance; 
-}
-
-/** Setter for {@link LinearSegmentParameter#specificSegmentAppearance}*/
-public LinearSegmentParameter setSpecificSegmentAppearance(int pSpecificSegmentAppearance)
-{
-    specificSegmentAppearance = pSpecificSegmentAppearance;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#specificSegmentAppearance}*/
-public int getSpecificSegmentAppearance()
-{
-    return specificSegmentAppearance; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentLocation}*/
-public LinearSegmentParameter setSegmentLocation(Vector3Double pSegmentLocation)
-{
-    segmentLocation = pSegmentLocation;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentLocation}*/
-public Vector3Double getSegmentLocation()
-{
-    return segmentLocation; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentOrientation}*/
-public LinearSegmentParameter setSegmentOrientation(EulerAngles pSegmentOrientation)
-{
-    segmentOrientation = pSegmentOrientation;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentOrientation}*/
-public EulerAngles getSegmentOrientation()
-{
-    return segmentOrientation; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentLength}*/
-public LinearSegmentParameter setSegmentLength(float pSegmentLength)
-{
-    segmentLength = pSegmentLength;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentLength}*/
-public float getSegmentLength()
-{
-    return segmentLength; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentWidth}*/
-public LinearSegmentParameter setSegmentWidth(float pSegmentWidth)
-{
-    segmentWidth = pSegmentWidth;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentWidth}*/
-public float getSegmentWidth()
-{
-    return segmentWidth; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentHeight}*/
-public LinearSegmentParameter setSegmentHeight(float pSegmentHeight)
-{
-    segmentHeight = pSegmentHeight;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentHeight}*/
-public float getSegmentHeight()
-{
-    return segmentHeight; 
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentDepth}*/
-public LinearSegmentParameter setSegmentDepth(float pSegmentDepth)
-{
-    segmentDepth = pSegmentDepth;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentDepth}*/
-public float getSegmentDepth()
-{
-    return segmentDepth; 
-}
-
-/** Setter for {@link LinearSegmentParameter#padding}*/
-public LinearSegmentParameter setPadding(int pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#padding}*/
-public int getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(segmentNumber);
-       segmentModification.marshal(dos);
-       generalSegmentAppearance.marshal(dos);
-       dos.writeInt(specificSegmentAppearance);
-       segmentLocation.marshal(dos);
-       segmentOrientation.marshal(dos);
-       dos.writeFloat(segmentLength);
-       dos.writeFloat(segmentWidth);
-       dos.writeFloat(segmentHeight);
-       dos.writeFloat(segmentDepth);
-       dos.writeInt(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        segmentNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += segmentModification.unmarshal(dis);
-        uPosition += generalSegmentAppearance.unmarshal(dis);
-        specificSegmentAppearance = dis.readInt();
-        uPosition += 4;
-        uPosition += segmentLocation.unmarshal(dis);
-        uPosition += segmentOrientation.unmarshal(dis);
-        segmentLength = dis.readFloat();
-        uPosition += 4;
-        segmentWidth = dis.readFloat();
-        uPosition += 4;
-        segmentHeight = dis.readFloat();
-        uPosition += 4;
-        segmentDepth = dis.readFloat();
-        uPosition += 4;
-        padding = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)segmentNumber);
-   segmentModification.marshal(buff);
-   generalSegmentAppearance.marshal(buff);
-   buff.putInt( (int)specificSegmentAppearance);
-   segmentLocation.marshal(buff);
-   segmentOrientation.marshal(buff);
-   buff.putFloat( (float)segmentLength);
-   buff.putFloat( (float)segmentWidth);
-   buff.putFloat( (float)segmentHeight);
-   buff.putFloat( (float)segmentDepth);
-   buff.putInt( (int)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    segmentNumber = (byte)(buff.get() & 0xFF);
-    segmentModification.unmarshal(buff);
-    generalSegmentAppearance.unmarshal(buff);
-    specificSegmentAppearance = buff.getInt();
-    segmentLocation.unmarshal(buff);
-    segmentOrientation.unmarshal(buff);
-    segmentLength = buff.getFloat();
-    segmentWidth = buff.getFloat();
-    segmentHeight = buff.getFloat();
-    segmentDepth = buff.getFloat();
-    padding = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LinearSegmentParameter rhs = (LinearSegmentParameter)obj;
-
-     if( ! (segmentNumber == rhs.segmentNumber)) ivarsEqual = false;
-     if( ! (segmentModification.equals( rhs.segmentModification) )) ivarsEqual = false;
-     if( ! (generalSegmentAppearance.equals( rhs.generalSegmentAppearance) )) ivarsEqual = false;
-     if( ! (specificSegmentAppearance == rhs.specificSegmentAppearance)) ivarsEqual = false;
-     if( ! (segmentLocation.equals( rhs.segmentLocation) )) ivarsEqual = false;
-     if( ! (segmentOrientation.equals( rhs.segmentOrientation) )) ivarsEqual = false;
-     if( ! (segmentLength == rhs.segmentLength)) ivarsEqual = false;
-     if( ! (segmentWidth == rhs.segmentWidth)) ivarsEqual = false;
-     if( ! (segmentHeight == rhs.segmentHeight)) ivarsEqual = false;
-     if( ! (segmentDepth == rhs.segmentDepth)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" segmentNumber: ").append(segmentNumber).append("\n");
-    sb.append(" segmentModification: ").append(segmentModification).append("\n");
-    sb.append(" generalSegmentAppearance: ").append(generalSegmentAppearance).append("\n");
-    sb.append(" specificSegmentAppearance: ").append(specificSegmentAppearance).append("\n");
-    sb.append(" segmentLocation: ").append(segmentLocation).append("\n");
-    sb.append(" segmentOrientation: ").append(segmentOrientation).append("\n");
-    sb.append(" segmentLength: ").append(segmentLength).append("\n");
-    sb.append(" segmentWidth: ").append(segmentWidth).append("\n");
-    sb.append(" segmentHeight: ").append(segmentHeight).append("\n");
-    sb.append(" segmentDepth: ").append(segmentDepth).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
deleted file mode 100644
index b3dfc13eb224812f959acb72fd3143a7b140f22e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveDeadReckoningParameters extends Object implements Serializable
-{
-   /**  uid 44 */
-   protected DeadReckoningAlgorithm deadReckoningAlgorithm = DeadReckoningAlgorithm.values()[0];
-
-   protected LEVector3FixedByte  entityLinearAcceleration = new LEVector3FixedByte(); 
-
-   protected LEVector3FixedByte  entityAngularVelocity = new LEVector3FixedByte(); 
-
-
-/** Constructor */
- public LiveDeadReckoningParameters()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += deadReckoningAlgorithm.getMarshalledSize();
-   marshalSize += entityLinearAcceleration.getMarshalledSize();
-   marshalSize += entityAngularVelocity.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveDeadReckoningParameters#deadReckoningAlgorithm}*/
-public LiveDeadReckoningParameters setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
-{
-    deadReckoningAlgorithm = pDeadReckoningAlgorithm;
-    return this;
-}
-
-/** Getter for {@link LiveDeadReckoningParameters#deadReckoningAlgorithm}*/
-public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
-{
-    return deadReckoningAlgorithm; 
-}
-
-/** Setter for {@link LiveDeadReckoningParameters#entityLinearAcceleration}*/
-public LiveDeadReckoningParameters setEntityLinearAcceleration(LEVector3FixedByte pEntityLinearAcceleration)
-{
-    entityLinearAcceleration = pEntityLinearAcceleration;
-    return this;
-}
-
-/** Getter for {@link LiveDeadReckoningParameters#entityLinearAcceleration}*/
-public LEVector3FixedByte getEntityLinearAcceleration()
-{
-    return entityLinearAcceleration; 
-}
-
-/** Setter for {@link LiveDeadReckoningParameters#entityAngularVelocity}*/
-public LiveDeadReckoningParameters setEntityAngularVelocity(LEVector3FixedByte pEntityAngularVelocity)
-{
-    entityAngularVelocity = pEntityAngularVelocity;
-    return this;
-}
-
-/** Getter for {@link LiveDeadReckoningParameters#entityAngularVelocity}*/
-public LEVector3FixedByte getEntityAngularVelocity()
-{
-    return entityAngularVelocity; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       deadReckoningAlgorithm.marshal(dos);
-       entityLinearAcceleration.marshal(dos);
-       entityAngularVelocity.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
-        uPosition += deadReckoningAlgorithm.getMarshalledSize();
-        uPosition += entityLinearAcceleration.unmarshal(dis);
-        uPosition += entityAngularVelocity.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   deadReckoningAlgorithm.marshal(buff);
-   entityLinearAcceleration.marshal(buff);
-   entityAngularVelocity.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
-    entityLinearAcceleration.unmarshal(buff);
-    entityAngularVelocity.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveDeadReckoningParameters rhs = (LiveDeadReckoningParameters)obj;
-
-     if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
-     if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
-     if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
-    sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
-    sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
deleted file mode 100644
index 7a154e2a9fb5c13089d660810dee384493cfc61c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a LEDetonationPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityDetonationPdu extends LEDetonationPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
deleted file mode 100644
index 779029909d06a8304c48d9d3cd4cd2beca95fd9d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class LiveEntityFamilyPdu extends LiveEntityPdu implements Serializable
-{
-
-/** Constructor */
- public LiveEntityFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.LIVE_ENTITY_LE_INFORMATION_INTERACTION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityFamilyPdu rhs = (LiveEntityFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
deleted file mode 100644
index 3c09ea0cecc167c43e5338a9695a632af90a028d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a LEFirePdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityFirePdu extends LEFirePdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
deleted file mode 100644
index ac6fcbc5a31573cf907485aa4f936cd2ae7faf2e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityIdentifier extends Object implements Serializable
-{
-   /** Live Simulation Address record (see 6.2.54)  */
-   protected LiveSimulationAddress  liveSimulationAddress = new LiveSimulationAddress(); 
-
-   /** Live entity number  */
-   protected short  entityNumber;
-
-
-/** Constructor */
- public LiveEntityIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += liveSimulationAddress.getMarshalledSize();
-   marshalSize += 2;  // entityNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityIdentifier#liveSimulationAddress}*/
-public LiveEntityIdentifier setLiveSimulationAddress(LiveSimulationAddress pLiveSimulationAddress)
-{
-    liveSimulationAddress = pLiveSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link LiveEntityIdentifier#liveSimulationAddress}*/
-public LiveSimulationAddress getLiveSimulationAddress()
-{
-    return liveSimulationAddress; 
-}
-
-/** Setter for {@link LiveEntityIdentifier#entityNumber}*/
-public LiveEntityIdentifier setEntityNumber(short pEntityNumber)
-{
-    entityNumber = pEntityNumber;
-    return this;
-}
-
-/** Getter for {@link LiveEntityIdentifier#entityNumber}*/
-public short getEntityNumber()
-{
-    return entityNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       liveSimulationAddress.marshal(dos);
-       dos.writeShort(entityNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += liveSimulationAddress.unmarshal(dis);
-        entityNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   liveSimulationAddress.marshal(buff);
-   buff.putShort( (short)entityNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    liveSimulationAddress.unmarshal(buff);
-    entityNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityIdentifier rhs = (LiveEntityIdentifier)obj;
-
-     if( ! (liveSimulationAddress.equals( rhs.liveSimulationAddress) )) ivarsEqual = false;
-     if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" liveSimulationAddress: ").append(liveSimulationAddress).append("\n");
-    sb.append(" entityNumber: ").append(entityNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
deleted file mode 100644
index 5f02a8faee5e687030fcbb1b73271a27c97ec07d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityLinearVelocity extends Object implements Serializable
-{
-   protected short  xComponent;
-
-   protected short  yComponent;
-
-   protected short  zComponent;
-
-
-/** Constructor */
- public LiveEntityLinearVelocity()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // xComponent
-   marshalSize += 2;  // yComponent
-   marshalSize += 2;  // zComponent
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityLinearVelocity#xComponent}*/
-public LiveEntityLinearVelocity setXComponent(short pXComponent)
-{
-    xComponent = pXComponent;
-    return this;
-}
-
-/** Getter for {@link LiveEntityLinearVelocity#xComponent}*/
-public short getXComponent()
-{
-    return xComponent; 
-}
-
-/** Setter for {@link LiveEntityLinearVelocity#yComponent}*/
-public LiveEntityLinearVelocity setYComponent(short pYComponent)
-{
-    yComponent = pYComponent;
-    return this;
-}
-
-/** Getter for {@link LiveEntityLinearVelocity#yComponent}*/
-public short getYComponent()
-{
-    return yComponent; 
-}
-
-/** Setter for {@link LiveEntityLinearVelocity#zComponent}*/
-public LiveEntityLinearVelocity setZComponent(short pZComponent)
-{
-    zComponent = pZComponent;
-    return this;
-}
-
-/** Getter for {@link LiveEntityLinearVelocity#zComponent}*/
-public short getZComponent()
-{
-    return zComponent; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(xComponent);
-       dos.writeShort(yComponent);
-       dos.writeShort(zComponent);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        xComponent = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        yComponent = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        zComponent = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)xComponent);
-   buff.putShort( (short)yComponent);
-   buff.putShort( (short)zComponent);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    xComponent = (short)(buff.getShort() & 0xFFFF);
-    yComponent = (short)(buff.getShort() & 0xFFFF);
-    zComponent = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityLinearVelocity rhs = (LiveEntityLinearVelocity)obj;
-
-     if( ! (xComponent == rhs.xComponent)) ivarsEqual = false;
-     if( ! (yComponent == rhs.yComponent)) ivarsEqual = false;
-     if( ! (zComponent == rhs.zComponent)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" xComponent: ").append(xComponent).append("\n");
-    sb.append(" yComponent: ").append(yComponent).append("\n");
-    sb.append(" zComponent: ").append(zComponent).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
deleted file mode 100644
index 7c86752b10ded88ae64de4a32977e514abf54e68..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 8 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityOrientation extends Object implements Serializable
-{
-   protected byte  psi;
-
-   protected byte  theta;
-
-   protected byte  phi;
-
-
-/** Constructor */
- public LiveEntityOrientation()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // psi
-   marshalSize += 1;  // theta
-   marshalSize += 1;  // phi
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityOrientation#psi}*/
-public LiveEntityOrientation setPsi(byte pPsi)
-{
-    psi = pPsi;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientation#psi}*/
-public byte getPsi()
-{
-    return psi; 
-}
-
-/** Setter for {@link LiveEntityOrientation#theta}*/
-public LiveEntityOrientation setTheta(byte pTheta)
-{
-    theta = pTheta;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientation#theta}*/
-public byte getTheta()
-{
-    return theta; 
-}
-
-/** Setter for {@link LiveEntityOrientation#phi}*/
-public LiveEntityOrientation setPhi(byte pPhi)
-{
-    phi = pPhi;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientation#phi}*/
-public byte getPhi()
-{
-    return phi; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(psi);
-       dos.writeByte(theta);
-       dos.writeByte(phi);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        psi = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        theta = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        phi = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)psi);
-   buff.put( (byte)theta);
-   buff.put( (byte)phi);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    psi = (byte)(buff.get() & 0xFF);
-    theta = (byte)(buff.get() & 0xFF);
-    phi = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityOrientation rhs = (LiveEntityOrientation)obj;
-
-     if( ! (psi == rhs.psi)) ivarsEqual = false;
-     if( ! (theta == rhs.theta)) ivarsEqual = false;
-     if( ! (phi == rhs.phi)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" psi: ").append(psi).append("\n");
-    sb.append(" theta: ").append(theta).append("\n");
-    sb.append(" phi: ").append(phi).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
deleted file mode 100644
index 906285c95d1c038c243b60f7bec0e9b4557d2ee0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityOrientation16 extends Object implements Serializable
-{
-   protected short  psi;
-
-   protected short  theta;
-
-   protected short  phi;
-
-
-/** Constructor */
- public LiveEntityOrientation16()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // psi
-   marshalSize += 2;  // theta
-   marshalSize += 2;  // phi
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityOrientation16#psi}*/
-public LiveEntityOrientation16 setPsi(short pPsi)
-{
-    psi = pPsi;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientation16#psi}*/
-public short getPsi()
-{
-    return psi; 
-}
-
-/** Setter for {@link LiveEntityOrientation16#theta}*/
-public LiveEntityOrientation16 setTheta(short pTheta)
-{
-    theta = pTheta;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientation16#theta}*/
-public short getTheta()
-{
-    return theta; 
-}
-
-/** Setter for {@link LiveEntityOrientation16#phi}*/
-public LiveEntityOrientation16 setPhi(short pPhi)
-{
-    phi = pPhi;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientation16#phi}*/
-public short getPhi()
-{
-    return phi; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(psi);
-       dos.writeShort(theta);
-       dos.writeShort(phi);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        psi = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        theta = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        phi = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)psi);
-   buff.putShort( (short)theta);
-   buff.putShort( (short)phi);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    psi = (short)(buff.getShort() & 0xFFFF);
-    theta = (short)(buff.getShort() & 0xFFFF);
-    phi = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityOrientation16 rhs = (LiveEntityOrientation16)obj;
-
-     if( ! (psi == rhs.psi)) ivarsEqual = false;
-     if( ! (theta == rhs.theta)) ivarsEqual = false;
-     if( ! (phi == rhs.phi)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" psi: ").append(psi).append("\n");
-    sb.append(" theta: ").append(theta).append("\n");
-    sb.append(" phi: ").append(phi).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
deleted file mode 100644
index e5a89cea4b50efe0ca8aaa95b6ed397df15fd14e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityOrientationError extends Object implements Serializable
-{
-   protected short  azimuthError;
-
-   protected short  elevationError;
-
-   protected short  rotationError;
-
-
-/** Constructor */
- public LiveEntityOrientationError()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // azimuthError
-   marshalSize += 2;  // elevationError
-   marshalSize += 2;  // rotationError
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityOrientationError#azimuthError}*/
-public LiveEntityOrientationError setAzimuthError(short pAzimuthError)
-{
-    azimuthError = pAzimuthError;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientationError#azimuthError}*/
-public short getAzimuthError()
-{
-    return azimuthError; 
-}
-
-/** Setter for {@link LiveEntityOrientationError#elevationError}*/
-public LiveEntityOrientationError setElevationError(short pElevationError)
-{
-    elevationError = pElevationError;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientationError#elevationError}*/
-public short getElevationError()
-{
-    return elevationError; 
-}
-
-/** Setter for {@link LiveEntityOrientationError#rotationError}*/
-public LiveEntityOrientationError setRotationError(short pRotationError)
-{
-    rotationError = pRotationError;
-    return this;
-}
-
-/** Getter for {@link LiveEntityOrientationError#rotationError}*/
-public short getRotationError()
-{
-    return rotationError; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(azimuthError);
-       dos.writeShort(elevationError);
-       dos.writeShort(rotationError);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        azimuthError = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        elevationError = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        rotationError = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)azimuthError);
-   buff.putShort( (short)elevationError);
-   buff.putShort( (short)rotationError);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    azimuthError = (short)(buff.getShort() & 0xFFFF);
-    elevationError = (short)(buff.getShort() & 0xFFFF);
-    rotationError = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityOrientationError rhs = (LiveEntityOrientationError)obj;
-
-     if( ! (azimuthError == rhs.azimuthError)) ivarsEqual = false;
-     if( ! (elevationError == rhs.elevationError)) ivarsEqual = false;
-     if( ! (rotationError == rhs.rotationError)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" azimuthError: ").append(azimuthError).append("\n");
-    sb.append(" elevationError: ").append(elevationError).append("\n");
-    sb.append(" rotationError: ").append(rotationError).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
deleted file mode 100644
index 8bb25672e0d3639aba404d3580ddd2590ba61b7d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The live entity PDUs have a slightly different header
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class LiveEntityPdu extends Pdu implements Serializable
-{
-   /** Subprotocol used to decode the PDU. Section 13 of EBV. uid 417 */
-   protected DISLiveEntitySubprotocolNumber subprotocolNumber = DISLiveEntitySubprotocolNumber.values()[0];
-
-   /** zero-filled array of padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public LiveEntityPdu()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += subprotocolNumber.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityPdu#subprotocolNumber}*/
-public LiveEntityPdu setSubprotocolNumber(DISLiveEntitySubprotocolNumber pSubprotocolNumber)
-{
-    subprotocolNumber = pSubprotocolNumber;
-    return this;
-}
-
-/** Getter for {@link LiveEntityPdu#subprotocolNumber}*/
-public DISLiveEntitySubprotocolNumber getSubprotocolNumber()
-{
-    return subprotocolNumber; 
-}
-
-/** Setter for {@link LiveEntityPdu#padding}*/
-public LiveEntityPdu setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link LiveEntityPdu#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       subprotocolNumber.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        subprotocolNumber = DISLiveEntitySubprotocolNumber.unmarshalEnum(dis);
-        uPosition += subprotocolNumber.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   subprotocolNumber.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    subprotocolNumber = DISLiveEntitySubprotocolNumber.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityPdu rhs = (LiveEntityPdu)obj;
-
-     if( ! (subprotocolNumber == rhs.subprotocolNumber)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" subprotocolNumber: ").append(subprotocolNumber).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
deleted file mode 100644
index 8a588cbc4731d6d853d7aa3dfa937487b9184a40..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityPositionError extends Object implements Serializable
-{
-   protected short  horizontalError;
-
-   protected short  verticalError;
-
-
-/** Constructor */
- public LiveEntityPositionError()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // horizontalError
-   marshalSize += 2;  // verticalError
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityPositionError#horizontalError}*/
-public LiveEntityPositionError setHorizontalError(short pHorizontalError)
-{
-    horizontalError = pHorizontalError;
-    return this;
-}
-
-/** Getter for {@link LiveEntityPositionError#horizontalError}*/
-public short getHorizontalError()
-{
-    return horizontalError; 
-}
-
-/** Setter for {@link LiveEntityPositionError#verticalError}*/
-public LiveEntityPositionError setVerticalError(short pVerticalError)
-{
-    verticalError = pVerticalError;
-    return this;
-}
-
-/** Getter for {@link LiveEntityPositionError#verticalError}*/
-public short getVerticalError()
-{
-    return verticalError; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(horizontalError);
-       dos.writeShort(verticalError);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        horizontalError = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        verticalError = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)horizontalError);
-   buff.putShort( (short)verticalError);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    horizontalError = (short)(buff.getShort() & 0xFFFF);
-    verticalError = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityPositionError rhs = (LiveEntityPositionError)obj;
-
-     if( ! (horizontalError == rhs.horizontalError)) ivarsEqual = false;
-     if( ! (verticalError == rhs.verticalError)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" horizontalError: ").append(horizontalError).append("\n");
-    sb.append(" verticalError: ").append(verticalError).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
deleted file mode 100644
index 08d86e19637e434ed6b5c6360abde19e0cb815d9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveEntityRelativeWorldCoordinates extends Object implements Serializable
-{
-   protected short  referencePoint;
-
-   protected short  deltaX;
-
-   protected short  deltaY;
-
-   protected short  deltaZ;
-
-
-/** Constructor */
- public LiveEntityRelativeWorldCoordinates()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // referencePoint
-   marshalSize += 2;  // deltaX
-   marshalSize += 2;  // deltaY
-   marshalSize += 2;  // deltaZ
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#referencePoint}*/
-public LiveEntityRelativeWorldCoordinates setReferencePoint(short pReferencePoint)
-{
-    referencePoint = pReferencePoint;
-    return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#referencePoint}*/
-public short getReferencePoint()
-{
-    return referencePoint; 
-}
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaX}*/
-public LiveEntityRelativeWorldCoordinates setDeltaX(short pDeltaX)
-{
-    deltaX = pDeltaX;
-    return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaX}*/
-public short getDeltaX()
-{
-    return deltaX; 
-}
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaY}*/
-public LiveEntityRelativeWorldCoordinates setDeltaY(short pDeltaY)
-{
-    deltaY = pDeltaY;
-    return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaY}*/
-public short getDeltaY()
-{
-    return deltaY; 
-}
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaZ}*/
-public LiveEntityRelativeWorldCoordinates setDeltaZ(short pDeltaZ)
-{
-    deltaZ = pDeltaZ;
-    return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaZ}*/
-public short getDeltaZ()
-{
-    return deltaZ; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(referencePoint);
-       dos.writeShort(deltaX);
-       dos.writeShort(deltaY);
-       dos.writeShort(deltaZ);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        referencePoint = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        deltaX = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        deltaY = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        deltaZ = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)referencePoint);
-   buff.putShort( (short)deltaX);
-   buff.putShort( (short)deltaY);
-   buff.putShort( (short)deltaZ);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    referencePoint = (short)(buff.getShort() & 0xFFFF);
-    deltaX = (short)(buff.getShort() & 0xFFFF);
-    deltaY = (short)(buff.getShort() & 0xFFFF);
-    deltaZ = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveEntityRelativeWorldCoordinates rhs = (LiveEntityRelativeWorldCoordinates)obj;
-
-     if( ! (referencePoint == rhs.referencePoint)) ivarsEqual = false;
-     if( ! (deltaX == rhs.deltaX)) ivarsEqual = false;
-     if( ! (deltaY == rhs.deltaY)) ivarsEqual = false;
-     if( ! (deltaZ == rhs.deltaZ)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" referencePoint: ").append(referencePoint).append("\n");
-    sb.append(" deltaX: ").append(deltaX).append("\n");
-    sb.append(" deltaY: ").append(deltaY).append("\n");
-    sb.append(" deltaZ: ").append(deltaZ).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
deleted file mode 100644
index b0034848ed1d809d9aa005b07100a19f2d53a0f5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class LiveSimulationAddress extends Object implements Serializable
-{
-   /** facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation. */
-   protected byte  liveSiteNumber;
-
-   /** An application associated with a live site is termed a live application. Each live application participating in an event  */
-   protected byte  liveApplicationNumber;
-
-
-/** Constructor */
- public LiveSimulationAddress()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // liveSiteNumber
-   marshalSize += 1;  // liveApplicationNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link LiveSimulationAddress#liveSiteNumber}*/
-public LiveSimulationAddress setLiveSiteNumber(byte pLiveSiteNumber)
-{
-    liveSiteNumber = pLiveSiteNumber;
-    return this;
-}
-
-/** Getter for {@link LiveSimulationAddress#liveSiteNumber}*/
-public byte getLiveSiteNumber()
-{
-    return liveSiteNumber; 
-}
-
-/** Setter for {@link LiveSimulationAddress#liveApplicationNumber}*/
-public LiveSimulationAddress setLiveApplicationNumber(byte pLiveApplicationNumber)
-{
-    liveApplicationNumber = pLiveApplicationNumber;
-    return this;
-}
-
-/** Getter for {@link LiveSimulationAddress#liveApplicationNumber}*/
-public byte getLiveApplicationNumber()
-{
-    return liveApplicationNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(liveSiteNumber);
-       dos.writeByte(liveApplicationNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        liveSiteNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        liveApplicationNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)liveSiteNumber);
-   buff.put( (byte)liveApplicationNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    liveSiteNumber = (byte)(buff.get() & 0xFF);
-    liveApplicationNumber = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LiveSimulationAddress rhs = (LiveSimulationAddress)obj;
-
-     if( ! (liveSiteNumber == rhs.liveSiteNumber)) ivarsEqual = false;
-     if( ! (liveApplicationNumber == rhs.liveApplicationNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" liveSiteNumber: ").append(liveSiteNumber).append("\n");
-    sb.append(" liveApplicationNumber: ").append(liveApplicationNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
deleted file mode 100644
index 16f53740ae6b1b2b6c53e1fb1b75ef4f1e992c1b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Abstract superclass for logistics PDUs. Section 7.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class LogisticsFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public LogisticsFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.LOGISTICS );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final LogisticsFamilyPdu rhs = (LogisticsFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Marshaller.java b/src-generated/edu/nps/moves/dis7/Marshaller.java
deleted file mode 100644
index adcc3705d987309c8310ec39a35f4729752d06cf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Marshaller.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Marshaller.java created on Apr 22, 2019 MOVES Institute Naval Postgraduate School, Monterey, CA, USA www.nps.edu
- */
-public interface Marshaller
-{
-    /**
-     * 
-     * @return size in bytes of a value from a stream
-     */
-    int getMarshalledSize();
-    
-    /**
-     * 
-     * @param dos the output stream to marshal to
-     * @throws Exception error during marshaling
-     */
-    void marshal(DataOutputStream dos) throws Exception;
-    
-    /**
-     * 
-     * @param dis the input stream to unmarshal from
-     * @return the size of the PDU
-     * @throws Exception error during unmarshalling
-     */
-    int unmarshal(DataInputStream dis) throws Exception;
-
-    /**
-     * Packs a Pdu into the ByteBuffer.
-     * @throws Exception error during marshaling
-     * @see java.nio.ByteBuffer
-     * @param buff The ByteBuffer at the position to begin writing
-     */
-    void marshal(ByteBuffer buff) throws Exception;
-    
-    /**
-     * Unpacks a Pdu from the underlying data.
-     * @return the size of the PDU
-     * @throws Exception error during unmarshalling
-     * @see java.nio.ByteBuffer
-     * @param buff The ByteBuffer at the position to begin reading
-     */
-    int unmarshal(ByteBuffer buff) throws Exception;
-}
diff --git a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
deleted file mode 100644
index 404353ce3ed3d17966966d53b724f918ab267a4d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MineEmplacementTime extends Object implements Serializable
-{
-   protected int  hour;
-
-   protected int  timePastTheHour;
-
-
-/** Constructor */
- public MineEmplacementTime()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // hour
-   marshalSize += 4;  // timePastTheHour
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MineEmplacementTime#hour}*/
-public MineEmplacementTime setHour(int pHour)
-{
-    hour = pHour;
-    return this;
-}
-
-/** Getter for {@link MineEmplacementTime#hour}*/
-public int getHour()
-{
-    return hour; 
-}
-
-/** Setter for {@link MineEmplacementTime#timePastTheHour}*/
-public MineEmplacementTime setTimePastTheHour(int pTimePastTheHour)
-{
-    timePastTheHour = pTimePastTheHour;
-    return this;
-}
-
-/** Getter for {@link MineEmplacementTime#timePastTheHour}*/
-public int getTimePastTheHour()
-{
-    return timePastTheHour; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(hour);
-       dos.writeInt(timePastTheHour);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        hour = dis.readInt();
-        uPosition += 4;
-        timePastTheHour = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)hour);
-   buff.putInt( (int)timePastTheHour);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    hour = buff.getInt();
-    timePastTheHour = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MineEmplacementTime rhs = (MineEmplacementTime)obj;
-
-     if( ! (hour == rhs.hour)) ivarsEqual = false;
-     if( ! (timePastTheHour == rhs.timePastTheHour)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" hour: ").append(hour).append("\n");
-    sb.append(" timePastTheHour: ").append(timePastTheHour).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
deleted file mode 100644
index 20e50bd2a3f88db8a3ccc0b8ed91c593db42bf74..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities.  Section 6.2.55 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MineEntityIdentifier extends Object implements Serializable
-{
-   /**  */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /**  */
-   protected short  mineEntityNumber;
-
-
-/** Constructor */
- public MineEntityIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // mineEntityNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MineEntityIdentifier#simulationAddress}*/
-public MineEntityIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link MineEntityIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link MineEntityIdentifier#mineEntityNumber}*/
-public MineEntityIdentifier setMineEntityNumber(short pMineEntityNumber)
-{
-    mineEntityNumber = pMineEntityNumber;
-    return this;
-}
-
-/** Getter for {@link MineEntityIdentifier#mineEntityNumber}*/
-public short getMineEntityNumber()
-{
-    return mineEntityNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(mineEntityNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        mineEntityNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)mineEntityNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    mineEntityNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MineEntityIdentifier rhs = (MineEntityIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (mineEntityNumber == rhs.mineEntityNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" mineEntityNumber: ").append(mineEntityNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
deleted file mode 100644
index 42495161e37b5cd498cd416e82ce71c6d2cdaade..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
+++ /dev/null
@@ -1,1062 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.4 Information about the location and status of a collection of mines in a minefield is conveyed through the Minefield Data PDU on an individual mine basis.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MinefieldDataPdu extends MinefieldFamilyPdu implements Serializable
-{
-   /** Minefield ID */
-   protected MinefieldIdentifier  minefieldID = new MinefieldIdentifier(); 
-
-   /** ID of entity making request */
-   protected SimulationIdentifier  requestingEntityID = new SimulationIdentifier(); 
-
-   /** Minefield sequence number */
-   protected short  minefieldSequenceNumbeer;
-
-   /** request ID */
-   protected byte  requestID;
-
-   /** pdu sequence number */
-   protected byte  pduSequenceNumber;
-
-   /** number of pdus in response */
-   protected byte  numberOfPdus;
-
-   /** how many mines are in this PDU */
-   protected byte  numberOfMinesInThisPdu;
-
-   /** how many sensor type are in this PDU */
-   protected byte  numberOfSensorTypes;
-
-   /** padding */
-   protected byte  padding = (byte)0;
-
-   /** 32 boolean field */
-   protected DataFilterRecord  dataFilter = new DataFilterRecord(); 
-
-   /** Mine type */
-   protected EntityType  mineType = new EntityType(); 
-
-   /** Sensor types, each 16 bits long */
-   protected List< MinefieldSensorType > sensorTypes = new ArrayList< MinefieldSensorType >();
- 
-   private byte[] padTo32 = new byte[0]; // pad to 32-bit boundary
-
-   /** Mine locations */
-   protected List< Vector3Float > mineLocation = new ArrayList< Vector3Float >();
- 
-   protected float[]  groundBurialDepthOffset = new float[0]; 
-
-   protected float[]  waterBurialDepthOffset = new float[0]; 
-
-   protected float[]  snowBurialDepthOffset = new float[0]; 
-
-   protected List< EulerAngles > mineOrientation = new ArrayList< EulerAngles >();
- 
-   protected float[]  thermalContrast = new float[0]; 
-
-   protected float[]  reflectance = new float[0]; 
-
-   protected List< MineEmplacementTime > mineEmplacementTime = new ArrayList< MineEmplacementTime >();
- 
-   protected short[]  mineEntityNumber = new short[0]; 
-
-   /**  uid 192 */
-   protected List< MinefieldDataFusing > fusing = new ArrayList< MinefieldDataFusing >();
- 
-   protected byte[]  scalarDetectionCoefficient = new byte[0]; 
-
-   /**  uid 202 */
-   protected List< MinefieldDataPaintScheme > paintScheme = new ArrayList< MinefieldDataPaintScheme >();
- 
-   private byte[] padTo32_2 = new byte[0]; // pad to 32-bit boundary
-
-   protected byte[]  numberOfTripDetonationWires = new byte[0]; 
-
-   private byte[] padTo32_3 = new byte[0]; // pad to 32-bit boundary
-
-   protected byte[]  numberOfVertices = new byte[0]; 
-
-
-/** Constructor */
- public MinefieldDataPdu()
- {
-    setPduType( DISPDUType.MINEFIELD_DATA );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += minefieldID.getMarshalledSize();
-   marshalSize += requestingEntityID.getMarshalledSize();
-   marshalSize += 2;  // minefieldSequenceNumbeer
-   marshalSize += 1;  // requestID
-   marshalSize += 1;  // pduSequenceNumber
-   marshalSize += 1;  // numberOfPdus
-   marshalSize += 1;  // numberOfMinesInThisPdu
-   marshalSize += 1;  // numberOfSensorTypes
-   marshalSize += 1;  // padding
-   marshalSize += dataFilter.getMarshalledSize();
-   marshalSize += mineType.getMarshalledSize();
-   for(int idx=0; idx < sensorTypes.size(); idx++)
-   {
-        MinefieldSensorType listElement = sensorTypes.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += padTo32.length;
-   for(int idx=0; idx < mineLocation.size(); idx++)
-   {
-        Vector3Float listElement = mineLocation.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += groundBurialDepthOffset.length * 4;
-   marshalSize += waterBurialDepthOffset.length * 4;
-   marshalSize += snowBurialDepthOffset.length * 4;
-   for(int idx=0; idx < mineOrientation.size(); idx++)
-   {
-        EulerAngles listElement = mineOrientation.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += thermalContrast.length * 4;
-   marshalSize += reflectance.length * 4;
-   for(int idx=0; idx < mineEmplacementTime.size(); idx++)
-   {
-        MineEmplacementTime listElement = mineEmplacementTime.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += mineEntityNumber.length * 2;
-   for(int idx=0; idx < fusing.size(); idx++)
-   {
-        MinefieldDataFusing listElement = fusing.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += scalarDetectionCoefficient.length * 1;
-   for(int idx=0; idx < paintScheme.size(); idx++)
-   {
-        MinefieldDataPaintScheme listElement = paintScheme.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   marshalSize += padTo32_2.length;
-   marshalSize += numberOfTripDetonationWires.length * 1;
-   marshalSize += padTo32_3.length;
-   marshalSize += numberOfVertices.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldDataPdu#minefieldID}*/
-public MinefieldDataPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
-    minefieldID = pMinefieldID;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
-{
-    return minefieldID; 
-}
-
-/** Setter for {@link MinefieldDataPdu#requestingEntityID}*/
-public MinefieldDataPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
-{
-    requestingEntityID = pRequestingEntityID;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#requestingEntityID}*/
-public SimulationIdentifier getRequestingEntityID()
-{
-    return requestingEntityID; 
-}
-
-/** Setter for {@link MinefieldDataPdu#minefieldSequenceNumbeer}*/
-public MinefieldDataPdu setMinefieldSequenceNumbeer(short pMinefieldSequenceNumbeer)
-{
-    minefieldSequenceNumbeer = pMinefieldSequenceNumbeer;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#minefieldSequenceNumbeer}*/
-public short getMinefieldSequenceNumbeer()
-{
-    return minefieldSequenceNumbeer; 
-}
-
-/** Setter for {@link MinefieldDataPdu#requestID}*/
-public MinefieldDataPdu setRequestID(byte pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#requestID}*/
-public byte getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link MinefieldDataPdu#pduSequenceNumber}*/
-public MinefieldDataPdu setPduSequenceNumber(byte pPduSequenceNumber)
-{
-    pduSequenceNumber = pPduSequenceNumber;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#pduSequenceNumber}*/
-public byte getPduSequenceNumber()
-{
-    return pduSequenceNumber; 
-}
-
-/** Setter for {@link MinefieldDataPdu#numberOfPdus}*/
-public MinefieldDataPdu setNumberOfPdus(byte pNumberOfPdus)
-{
-    numberOfPdus = pNumberOfPdus;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#numberOfPdus}*/
-public byte getNumberOfPdus()
-{
-    return numberOfPdus; 
-}
-
-/** Setter for {@link MinefieldDataPdu#padding}*/
-public MinefieldDataPdu setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link MinefieldDataPdu#dataFilter}*/
-public MinefieldDataPdu setDataFilter(DataFilterRecord pDataFilter)
-{
-    dataFilter = pDataFilter;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#dataFilter}*/
-public DataFilterRecord getDataFilter()
-{
-    return dataFilter; 
-}
-
-/** Setter for {@link MinefieldDataPdu#mineType}*/
-public MinefieldDataPdu setMineType(EntityType pMineType)
-{
-    mineType = pMineType;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineType}*/
-public EntityType getMineType()
-{
-    return mineType; 
-}
-
-/** Setter for {@link MinefieldDataPdu#sensorTypes}*/
-public MinefieldDataPdu setSensorTypes(List<MinefieldSensorType> pSensorTypes)
-{
-    sensorTypes = pSensorTypes;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#sensorTypes}*/
-public List<MinefieldSensorType> getSensorTypes()
-{
-    return sensorTypes; 
-}
-
-/** Setter for {@link MinefieldDataPdu#mineLocation}*/
-public MinefieldDataPdu setMineLocation(List<Vector3Float> pMineLocation)
-{
-    mineLocation = pMineLocation;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineLocation}*/
-public List<Vector3Float> getMineLocation()
-{
-    return mineLocation; 
-}
-
-/** Setter for {@link MinefieldDataPdu#groundBurialDepthOffset}*/
-public MinefieldDataPdu setGroundBurialDepthOffset(float[] pGroundBurialDepthOffset)
-{
-    groundBurialDepthOffset = pGroundBurialDepthOffset;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#groundBurialDepthOffset}*/
-public float[] getGroundBurialDepthOffset()
-{
-    return groundBurialDepthOffset; 
-}
-
-/** Setter for {@link MinefieldDataPdu#waterBurialDepthOffset}*/
-public MinefieldDataPdu setWaterBurialDepthOffset(float[] pWaterBurialDepthOffset)
-{
-    waterBurialDepthOffset = pWaterBurialDepthOffset;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#waterBurialDepthOffset}*/
-public float[] getWaterBurialDepthOffset()
-{
-    return waterBurialDepthOffset; 
-}
-
-/** Setter for {@link MinefieldDataPdu#snowBurialDepthOffset}*/
-public MinefieldDataPdu setSnowBurialDepthOffset(float[] pSnowBurialDepthOffset)
-{
-    snowBurialDepthOffset = pSnowBurialDepthOffset;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#snowBurialDepthOffset}*/
-public float[] getSnowBurialDepthOffset()
-{
-    return snowBurialDepthOffset; 
-}
-
-/** Setter for {@link MinefieldDataPdu#mineOrientation}*/
-public MinefieldDataPdu setMineOrientation(List<EulerAngles> pMineOrientation)
-{
-    mineOrientation = pMineOrientation;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineOrientation}*/
-public List<EulerAngles> getMineOrientation()
-{
-    return mineOrientation; 
-}
-
-/** Setter for {@link MinefieldDataPdu#thermalContrast}*/
-public MinefieldDataPdu setThermalContrast(float[] pThermalContrast)
-{
-    thermalContrast = pThermalContrast;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#thermalContrast}*/
-public float[] getThermalContrast()
-{
-    return thermalContrast; 
-}
-
-/** Setter for {@link MinefieldDataPdu#reflectance}*/
-public MinefieldDataPdu setReflectance(float[] pReflectance)
-{
-    reflectance = pReflectance;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#reflectance}*/
-public float[] getReflectance()
-{
-    return reflectance; 
-}
-
-/** Setter for {@link MinefieldDataPdu#mineEmplacementTime}*/
-public MinefieldDataPdu setMineEmplacementTime(List<MineEmplacementTime> pMineEmplacementTime)
-{
-    mineEmplacementTime = pMineEmplacementTime;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineEmplacementTime}*/
-public List<MineEmplacementTime> getMineEmplacementTime()
-{
-    return mineEmplacementTime; 
-}
-
-/** Setter for {@link MinefieldDataPdu#mineEntityNumber}*/
-public MinefieldDataPdu setMineEntityNumber(short[] pMineEntityNumber)
-{
-    mineEntityNumber = pMineEntityNumber;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineEntityNumber}*/
-public short[] getMineEntityNumber()
-{
-    return mineEntityNumber; 
-}
-
-/** Setter for {@link MinefieldDataPdu#fusing}*/
-public MinefieldDataPdu setFusing(List<MinefieldDataFusing> pFusing)
-{
-    fusing = pFusing;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#fusing}*/
-public List<MinefieldDataFusing> getFusing()
-{
-    return fusing; 
-}
-
-/** Setter for {@link MinefieldDataPdu#scalarDetectionCoefficient}*/
-public MinefieldDataPdu setScalarDetectionCoefficient(byte[] pScalarDetectionCoefficient)
-{
-    scalarDetectionCoefficient = pScalarDetectionCoefficient;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#scalarDetectionCoefficient}*/
-public byte[] getScalarDetectionCoefficient()
-{
-    return scalarDetectionCoefficient; 
-}
-
-/** Setter for {@link MinefieldDataPdu#paintScheme}*/
-public MinefieldDataPdu setPaintScheme(List<MinefieldDataPaintScheme> pPaintScheme)
-{
-    paintScheme = pPaintScheme;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#paintScheme}*/
-public List<MinefieldDataPaintScheme> getPaintScheme()
-{
-    return paintScheme; 
-}
-
-/** Setter for {@link MinefieldDataPdu#numberOfTripDetonationWires}*/
-public MinefieldDataPdu setNumberOfTripDetonationWires(byte[] pNumberOfTripDetonationWires)
-{
-    numberOfTripDetonationWires = pNumberOfTripDetonationWires;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#numberOfTripDetonationWires}*/
-public byte[] getNumberOfTripDetonationWires()
-{
-    return numberOfTripDetonationWires; 
-}
-
-/** Setter for {@link MinefieldDataPdu#numberOfVertices}*/
-public MinefieldDataPdu setNumberOfVertices(byte[] pNumberOfVertices)
-{
-    numberOfVertices = pNumberOfVertices;
-    return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#numberOfVertices}*/
-public byte[] getNumberOfVertices()
-{
-    return numberOfVertices; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       minefieldID.marshal(dos);
-       requestingEntityID.marshal(dos);
-       dos.writeShort(minefieldSequenceNumbeer);
-       dos.writeByte(requestID);
-       dos.writeByte(pduSequenceNumber);
-       dos.writeByte(numberOfPdus);
-       dos.writeByte(numberOfVertices.length);
-       dos.writeByte(sensorTypes.size());
-       dos.writeByte(padding);
-       dataFilter.marshal(dos);
-       mineType.marshal(dos);
-
-       for(int idx = 0; idx < sensorTypes.size(); idx++)
-       {
-            MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
-            aMinefieldSensorType.marshal(dos);
-       }
-
-       padTo32 = new byte[Align.to32bits(dos)];
-
-       for(int idx = 0; idx < mineLocation.size(); idx++)
-       {
-            Vector3Float aVector3Float = mineLocation.get(idx);
-            aVector3Float.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
-           dos.writeFloat(groundBurialDepthOffset[idx]);
-
-
-       for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
-           dos.writeFloat(waterBurialDepthOffset[idx]);
-
-
-       for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
-           dos.writeFloat(snowBurialDepthOffset[idx]);
-
-
-       for(int idx = 0; idx < mineOrientation.size(); idx++)
-       {
-            EulerAngles aEulerAngles = mineOrientation.get(idx);
-            aEulerAngles.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < thermalContrast.length; idx++)
-           dos.writeFloat(thermalContrast[idx]);
-
-
-       for(int idx = 0; idx < reflectance.length; idx++)
-           dos.writeFloat(reflectance[idx]);
-
-
-       for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
-       {
-            MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
-            aMineEmplacementTime.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < mineEntityNumber.length; idx++)
-           dos.writeShort(mineEntityNumber[idx]);
-
-
-       for(int idx = 0; idx < fusing.size(); idx++)
-       {
-            MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
-            aMinefieldDataFusing.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
-           dos.writeByte(scalarDetectionCoefficient[idx]);
-
-
-       for(int idx = 0; idx < paintScheme.size(); idx++)
-       {
-            MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
-            aMinefieldDataPaintScheme.marshal(dos);
-       }
-
-       padTo32_2 = new byte[Align.to32bits(dos)];
-
-       for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
-           dos.writeByte(numberOfTripDetonationWires[idx]);
-
-       padTo32_3 = new byte[Align.to32bits(dos)];
-
-       for(int idx = 0; idx < numberOfVertices.length; idx++)
-           dos.writeByte(numberOfVertices[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += minefieldID.unmarshal(dis);
-        uPosition += requestingEntityID.unmarshal(dis);
-        minefieldSequenceNumbeer = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pduSequenceNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfPdus = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfMinesInThisPdu = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfSensorTypes = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += dataFilter.unmarshal(dis);
-        uPosition += mineType.unmarshal(dis);
-        for(int idx = 0; idx < numberOfSensorTypes; idx++)
-        {
-            MinefieldSensorType anX = new MinefieldSensorType();
-            uPosition += anX.unmarshal(dis);
-            sensorTypes.add(anX);
-        }
-
-        padTo32 = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padTo32.length;
-        for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-        {
-            Vector3Float anX = new Vector3Float();
-            uPosition += anX.unmarshal(dis);
-            mineLocation.add(anX);
-        }
-
-        for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
-            groundBurialDepthOffset[idx] = dis.readFloat();
-        uPosition += (groundBurialDepthOffset.length * 4);
-        for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
-            waterBurialDepthOffset[idx] = dis.readFloat();
-        uPosition += (waterBurialDepthOffset.length * 4);
-        for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
-            snowBurialDepthOffset[idx] = dis.readFloat();
-        uPosition += (snowBurialDepthOffset.length * 4);
-        for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-        {
-            EulerAngles anX = new EulerAngles();
-            uPosition += anX.unmarshal(dis);
-            mineOrientation.add(anX);
-        }
-
-        for(int idx = 0; idx < thermalContrast.length; idx++)
-            thermalContrast[idx] = dis.readFloat();
-        uPosition += (thermalContrast.length * 4);
-        for(int idx = 0; idx < reflectance.length; idx++)
-            reflectance[idx] = dis.readFloat();
-        uPosition += (reflectance.length * 4);
-        for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-        {
-            MineEmplacementTime anX = new MineEmplacementTime();
-            uPosition += anX.unmarshal(dis);
-            mineEmplacementTime.add(anX);
-        }
-
-        for(int idx = 0; idx < mineEntityNumber.length; idx++)
-            mineEntityNumber[idx] = dis.readShort();
-        uPosition += (mineEntityNumber.length * 2);
-        for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-        {
-            MinefieldDataFusing anX = new MinefieldDataFusing();
-            uPosition += anX.unmarshal(dis);
-            fusing.add(anX);
-        }
-
-        for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
-            scalarDetectionCoefficient[idx] = dis.readByte();
-        uPosition += (scalarDetectionCoefficient.length * 1);
-        for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-        {
-            MinefieldDataPaintScheme anX = new MinefieldDataPaintScheme();
-            uPosition += anX.unmarshal(dis);
-            paintScheme.add(anX);
-        }
-
-        padTo32_2 = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padTo32_2.length;
-        for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
-            numberOfTripDetonationWires[idx] = dis.readByte();
-        uPosition += (numberOfTripDetonationWires.length * 1);
-        padTo32_3 = new byte[Align.from32bits(uPosition,dis)];
-        uPosition += padTo32_3.length;
-        for(int idx = 0; idx < numberOfVertices.length; idx++)
-            numberOfVertices[idx] = dis.readByte();
-        uPosition += (numberOfVertices.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   minefieldID.marshal(buff);
-   requestingEntityID.marshal(buff);
-   buff.putShort( (short)minefieldSequenceNumbeer);
-   buff.put( (byte)requestID);
-   buff.put( (byte)pduSequenceNumber);
-   buff.put( (byte)numberOfPdus);
-   buff.put( (byte)numberOfVertices.length);
-   buff.put( (byte)sensorTypes.size());
-   buff.put( (byte)padding);
-   dataFilter.marshal(buff);
-   mineType.marshal(buff);
-
-   for(int idx = 0; idx < sensorTypes.size(); idx++)
-   {
-        MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
-        aMinefieldSensorType.marshal(buff);
-   }
-
-   padTo32 = new byte[Align.to32bits(buff)];
-
-   for(int idx = 0; idx < mineLocation.size(); idx++)
-   {
-        Vector3Float aVector3Float = mineLocation.get(idx);
-        aVector3Float.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
-       buff.putFloat((float)groundBurialDepthOffset[idx]);
-
-
-   for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
-       buff.putFloat((float)waterBurialDepthOffset[idx]);
-
-
-   for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
-       buff.putFloat((float)snowBurialDepthOffset[idx]);
-
-
-   for(int idx = 0; idx < mineOrientation.size(); idx++)
-   {
-        EulerAngles aEulerAngles = mineOrientation.get(idx);
-        aEulerAngles.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < thermalContrast.length; idx++)
-       buff.putFloat((float)thermalContrast[idx]);
-
-
-   for(int idx = 0; idx < reflectance.length; idx++)
-       buff.putFloat((float)reflectance[idx]);
-
-
-   for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
-   {
-        MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
-        aMineEmplacementTime.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < mineEntityNumber.length; idx++)
-       buff.putShort((short)mineEntityNumber[idx]);
-
-
-   for(int idx = 0; idx < fusing.size(); idx++)
-   {
-        MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
-        aMinefieldDataFusing.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
-       buff.put((byte)scalarDetectionCoefficient[idx]);
-
-
-   for(int idx = 0; idx < paintScheme.size(); idx++)
-   {
-        MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
-        aMinefieldDataPaintScheme.marshal(buff);
-   }
-
-   padTo32_2 = new byte[Align.to32bits(buff)];
-
-   for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
-       buff.put((byte)numberOfTripDetonationWires[idx]);
-
-   padTo32_3 = new byte[Align.to32bits(buff)];
-
-   for(int idx = 0; idx < numberOfVertices.length; idx++)
-       buff.put((byte)numberOfVertices[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    minefieldID.unmarshal(buff);
-    requestingEntityID.unmarshal(buff);
-    minefieldSequenceNumbeer = (short)(buff.getShort() & 0xFFFF);
-    requestID = (byte)(buff.get() & 0xFF);
-    pduSequenceNumber = (byte)(buff.get() & 0xFF);
-    numberOfPdus = (byte)(buff.get() & 0xFF);
-    numberOfMinesInThisPdu = (byte)(buff.get() & 0xFF);
-    numberOfSensorTypes = (byte)(buff.get() & 0xFF);
-    padding = (byte)(buff.get() & 0xFF);
-    dataFilter.unmarshal(buff);
-    mineType.unmarshal(buff);
-    for(int idx = 0; idx < numberOfSensorTypes; idx++)
-    {
-    MinefieldSensorType anX = new MinefieldSensorType();
-    anX.unmarshal(buff);
-    sensorTypes.add(anX);
-    }
-
-    padTo32 = new byte[Align.from32bits(buff)];
-    for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-    {
-    Vector3Float anX = new Vector3Float();
-    anX.unmarshal(buff);
-    mineLocation.add(anX);
-    }
-
-    for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
-        groundBurialDepthOffset[idx] = buff.getFloat();
-    for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
-        waterBurialDepthOffset[idx] = buff.getFloat();
-    for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
-        snowBurialDepthOffset[idx] = buff.getFloat();
-    for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-    {
-    EulerAngles anX = new EulerAngles();
-    anX.unmarshal(buff);
-    mineOrientation.add(anX);
-    }
-
-    for(int idx = 0; idx < thermalContrast.length; idx++)
-        thermalContrast[idx] = buff.getFloat();
-    for(int idx = 0; idx < reflectance.length; idx++)
-        reflectance[idx] = buff.getFloat();
-    for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-    {
-    MineEmplacementTime anX = new MineEmplacementTime();
-    anX.unmarshal(buff);
-    mineEmplacementTime.add(anX);
-    }
-
-    for(int idx = 0; idx < mineEntityNumber.length; idx++)
-        mineEntityNumber[idx] = buff.getShort();
-    for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-    {
-    MinefieldDataFusing anX = new MinefieldDataFusing();
-    anX.unmarshal(buff);
-    fusing.add(anX);
-    }
-
-    for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
-        scalarDetectionCoefficient[idx] = buff.get();
-    for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
-    {
-    MinefieldDataPaintScheme anX = new MinefieldDataPaintScheme();
-    anX.unmarshal(buff);
-    paintScheme.add(anX);
-    }
-
-    padTo32_2 = new byte[Align.from32bits(buff)];
-    for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
-        numberOfTripDetonationWires[idx] = buff.get();
-    padTo32_3 = new byte[Align.from32bits(buff)];
-    for(int idx = 0; idx < numberOfVertices.length; idx++)
-        numberOfVertices[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldDataPdu rhs = (MinefieldDataPdu)obj;
-
-     if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
-     if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
-     if( ! (minefieldSequenceNumbeer == rhs.minefieldSequenceNumbeer)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (pduSequenceNumber == rhs.pduSequenceNumber)) ivarsEqual = false;
-     if( ! (numberOfPdus == rhs.numberOfPdus)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (dataFilter.equals( rhs.dataFilter) )) ivarsEqual = false;
-     if( ! (mineType.equals( rhs.mineType) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < sensorTypes.size(); idx++)
-        if( ! ( sensorTypes.get(idx).equals(rhs.sensorTypes.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < mineLocation.size(); idx++)
-        if( ! ( mineLocation.get(idx).equals(rhs.mineLocation.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(groundBurialDepthOffset[idx] == rhs.groundBurialDepthOffset[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(waterBurialDepthOffset[idx] == rhs.waterBurialDepthOffset[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(snowBurialDepthOffset[idx] == rhs.snowBurialDepthOffset[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < mineOrientation.size(); idx++)
-        if( ! ( mineOrientation.get(idx).equals(rhs.mineOrientation.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(thermalContrast[idx] == rhs.thermalContrast[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(reflectance[idx] == rhs.reflectance[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
-        if( ! ( mineEmplacementTime.get(idx).equals(rhs.mineEmplacementTime.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(mineEntityNumber[idx] == rhs.mineEntityNumber[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < fusing.size(); idx++)
-        if( ! ( fusing.get(idx).equals(rhs.fusing.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(scalarDetectionCoefficient[idx] == rhs.scalarDetectionCoefficient[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < paintScheme.size(); idx++)
-        if( ! ( paintScheme.get(idx).equals(rhs.paintScheme.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(numberOfTripDetonationWires[idx] == rhs.numberOfTripDetonationWires[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(numberOfVertices[idx] == rhs.numberOfVertices[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" minefieldID: ").append(minefieldID).append("\n");
-    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
-    sb.append(" minefieldSequenceNumbeer: ").append(minefieldSequenceNumbeer).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" pduSequenceNumber: ").append(pduSequenceNumber).append("\n");
-    sb.append(" numberOfPdus: ").append(numberOfPdus).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" dataFilter: ").append(dataFilter).append("\n");
-    sb.append(" mineType: ").append(mineType).append("\n");
-    sb.append(" padTo32: ").append(padTo32).append("\n");
-    sb.append(" groundBurialDepthOffset: ").append("\n");
-    sb.append(Arrays.toString(groundBurialDepthOffset)).append("\n");
-    sb.append(" waterBurialDepthOffset: ").append("\n");
-    sb.append(Arrays.toString(waterBurialDepthOffset)).append("\n");
-    sb.append(" snowBurialDepthOffset: ").append("\n");
-    sb.append(Arrays.toString(snowBurialDepthOffset)).append("\n");
-    sb.append(" thermalContrast: ").append("\n");
-    sb.append(Arrays.toString(thermalContrast)).append("\n");
-    sb.append(" reflectance: ").append("\n");
-    sb.append(Arrays.toString(reflectance)).append("\n");
-    sb.append(" mineEntityNumber: ").append("\n");
-    sb.append(Arrays.toString(mineEntityNumber)).append("\n");
-    sb.append(" scalarDetectionCoefficient: ").append("\n");
-    sb.append(Arrays.toString(scalarDetectionCoefficient)).append("\n");
-    sb.append(" padTo32_2: ").append(padTo32_2).append("\n");
-    sb.append(" numberOfTripDetonationWires: ").append("\n");
-    sb.append(Arrays.toString(numberOfTripDetonationWires)).append("\n");
-    sb.append(" padTo32_3: ").append(padTo32_3).append("\n");
-    sb.append(" numberOfVertices: ").append("\n");
-    sb.append(Arrays.toString(numberOfVertices)).append("\n");
-    sb.append(" sensorTypes: ").append("\n");
-    sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" mineLocation: ").append("\n");
-    mineLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" mineOrientation: ").append("\n");
-    mineOrientation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" mineEmplacementTime: ").append("\n");
-    mineEmplacementTime.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" fusing: ").append("\n");
-    fusing.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" paintScheme: ").append("\n");
-    paintScheme.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
deleted file mode 100644
index 6389f4db83bd560aa9cfa08aad50d3bd3555cd82..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  Abstract superclass for PDUs relating to minefields. Section 7.9
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class MinefieldFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public MinefieldFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.MINEFIELD );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldFamilyPdu rhs = (MinefieldFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
deleted file mode 100644
index c44777e0213d13760d02e743bd1d633a680cffc3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of a minefield Section 6.2.56 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MinefieldIdentifier extends Object implements Serializable
-{
-   /**  */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /**  */
-   protected short  minefieldNumber;
-
-
-/** Constructor */
- public MinefieldIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // minefieldNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldIdentifier#simulationAddress}*/
-public MinefieldIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link MinefieldIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link MinefieldIdentifier#minefieldNumber}*/
-public MinefieldIdentifier setMinefieldNumber(short pMinefieldNumber)
-{
-    minefieldNumber = pMinefieldNumber;
-    return this;
-}
-
-/** Getter for {@link MinefieldIdentifier#minefieldNumber}*/
-public short getMinefieldNumber()
-{
-    return minefieldNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(minefieldNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        minefieldNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)minefieldNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    minefieldNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldIdentifier rhs = (MinefieldIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (minefieldNumber == rhs.minefieldNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" minefieldNumber: ").append(minefieldNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
deleted file mode 100644
index fac662e6799d51dc34d8670df95dbc4f523d5c7f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.3 Contains information about the requesting entity and the region and mine types of interest to the requesting entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MinefieldQueryPdu extends MinefieldFamilyPdu implements Serializable
-{
-   /** Minefield ID */
-   protected MinefieldIdentifier  minefieldID = new MinefieldIdentifier(); 
-
-   /** EID of entity making the request */
-   protected EntityID  requestingEntityID = new EntityID(); 
-
-   /** request ID */
-   protected byte  requestID;
-
-   /** Number of perimeter points for the minefield */
-   protected byte  numberOfPerimeterPoints;
-
-   protected byte  padding;
-
-   /** Number of sensor types */
-   protected byte  numberOfSensorTypes;
-
-   /** data filter, 32 boolean fields */
-   protected DataFilterRecord  dataFilter = new DataFilterRecord(); 
-
-   /** Entity type of mine being requested */
-   protected EntityType  requestedMineType = new EntityType(); 
-
-   /** perimeter points of request */
-   protected List< Vector2Float > requestedPerimeterPoints = new ArrayList< Vector2Float >();
- 
-   /** Sensor types, each 16 bits long */
-   protected List< MinefieldSensorType > sensorTypes = new ArrayList< MinefieldSensorType >();
- 
-
-/** Constructor */
- public MinefieldQueryPdu()
- {
-    setPduType( DISPDUType.MINEFIELD_QUERY );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += minefieldID.getMarshalledSize();
-   marshalSize += requestingEntityID.getMarshalledSize();
-   marshalSize += 1;  // requestID
-   marshalSize += 1;  // numberOfPerimeterPoints
-   marshalSize += 1;  // padding
-   marshalSize += 1;  // numberOfSensorTypes
-   marshalSize += dataFilter.getMarshalledSize();
-   marshalSize += requestedMineType.getMarshalledSize();
-   for(int idx=0; idx < requestedPerimeterPoints.size(); idx++)
-   {
-        Vector2Float listElement = requestedPerimeterPoints.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < sensorTypes.size(); idx++)
-   {
-        MinefieldSensorType listElement = sensorTypes.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldQueryPdu#minefieldID}*/
-public MinefieldQueryPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
-    minefieldID = pMinefieldID;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
-{
-    return minefieldID; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestingEntityID}*/
-public MinefieldQueryPdu setRequestingEntityID(EntityID pRequestingEntityID)
-{
-    requestingEntityID = pRequestingEntityID;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestingEntityID}*/
-public EntityID getRequestingEntityID()
-{
-    return requestingEntityID; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestID}*/
-public MinefieldQueryPdu setRequestID(byte pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestID}*/
-public byte getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#padding}*/
-public MinefieldQueryPdu setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#dataFilter}*/
-public MinefieldQueryPdu setDataFilter(DataFilterRecord pDataFilter)
-{
-    dataFilter = pDataFilter;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#dataFilter}*/
-public DataFilterRecord getDataFilter()
-{
-    return dataFilter; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestedMineType}*/
-public MinefieldQueryPdu setRequestedMineType(EntityType pRequestedMineType)
-{
-    requestedMineType = pRequestedMineType;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestedMineType}*/
-public EntityType getRequestedMineType()
-{
-    return requestedMineType; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestedPerimeterPoints}*/
-public MinefieldQueryPdu setRequestedPerimeterPoints(List<Vector2Float> pRequestedPerimeterPoints)
-{
-    requestedPerimeterPoints = pRequestedPerimeterPoints;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestedPerimeterPoints}*/
-public List<Vector2Float> getRequestedPerimeterPoints()
-{
-    return requestedPerimeterPoints; 
-}
-
-/** Setter for {@link MinefieldQueryPdu#sensorTypes}*/
-public MinefieldQueryPdu setSensorTypes(List<MinefieldSensorType> pSensorTypes)
-{
-    sensorTypes = pSensorTypes;
-    return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#sensorTypes}*/
-public List<MinefieldSensorType> getSensorTypes()
-{
-    return sensorTypes; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       minefieldID.marshal(dos);
-       requestingEntityID.marshal(dos);
-       dos.writeByte(requestID);
-       dos.writeByte(requestedPerimeterPoints.size());
-       dos.writeByte(padding);
-       dos.writeByte(sensorTypes.size());
-       dataFilter.marshal(dos);
-       requestedMineType.marshal(dos);
-
-       for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
-       {
-            Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
-            aVector2Float.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < sensorTypes.size(); idx++)
-       {
-            MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
-            aMinefieldSensorType.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += minefieldID.unmarshal(dis);
-        uPosition += requestingEntityID.unmarshal(dis);
-        requestID = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfPerimeterPoints = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfSensorTypes = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += dataFilter.unmarshal(dis);
-        uPosition += requestedMineType.unmarshal(dis);
-        for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
-        {
-            Vector2Float anX = new Vector2Float();
-            uPosition += anX.unmarshal(dis);
-            requestedPerimeterPoints.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfSensorTypes; idx++)
-        {
-            MinefieldSensorType anX = new MinefieldSensorType();
-            uPosition += anX.unmarshal(dis);
-            sensorTypes.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   minefieldID.marshal(buff);
-   requestingEntityID.marshal(buff);
-   buff.put( (byte)requestID);
-   buff.put( (byte)requestedPerimeterPoints.size());
-   buff.put( (byte)padding);
-   buff.put( (byte)sensorTypes.size());
-   dataFilter.marshal(buff);
-   requestedMineType.marshal(buff);
-
-   for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
-   {
-        Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
-        aVector2Float.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < sensorTypes.size(); idx++)
-   {
-        MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
-        aMinefieldSensorType.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    minefieldID.unmarshal(buff);
-    requestingEntityID.unmarshal(buff);
-    requestID = (byte)(buff.get() & 0xFF);
-    numberOfPerimeterPoints = (byte)(buff.get() & 0xFF);
-    padding = (byte)(buff.get() & 0xFF);
-    numberOfSensorTypes = (byte)(buff.get() & 0xFF);
-    dataFilter.unmarshal(buff);
-    requestedMineType.unmarshal(buff);
-    for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
-    {
-    Vector2Float anX = new Vector2Float();
-    anX.unmarshal(buff);
-    requestedPerimeterPoints.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfSensorTypes; idx++)
-    {
-    MinefieldSensorType anX = new MinefieldSensorType();
-    anX.unmarshal(buff);
-    sensorTypes.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldQueryPdu rhs = (MinefieldQueryPdu)obj;
-
-     if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
-     if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (dataFilter.equals( rhs.dataFilter) )) ivarsEqual = false;
-     if( ! (requestedMineType.equals( rhs.requestedMineType) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
-        if( ! ( requestedPerimeterPoints.get(idx).equals(rhs.requestedPerimeterPoints.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < sensorTypes.size(); idx++)
-        if( ! ( sensorTypes.get(idx).equals(rhs.sensorTypes.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" minefieldID: ").append(minefieldID).append("\n");
-    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" dataFilter: ").append(dataFilter).append("\n");
-    sb.append(" requestedMineType: ").append(requestedMineType).append("\n");
-    sb.append(" requestedPerimeterPoints: ").append("\n");
-    requestedPerimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" sensorTypes: ").append("\n");
-    sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
deleted file mode 100644
index a74093cedb899b1911820300a3ee94d091d54f56..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.5 Contains information about the requesting entity and the PDU(s) that were not received in response to a query.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MinefieldResponseNACKPdu extends MinefieldFamilyPdu implements Serializable
-{
-   /** Minefield ID */
-   protected MinefieldIdentifier  minefieldID = new MinefieldIdentifier(); 
-
-   /** entity ID making the request */
-   protected SimulationIdentifier  requestingEntityID = new SimulationIdentifier(); 
-
-   /** request ID */
-   protected byte  requestID;
-
-   /** how many pdus were missing */
-   protected byte  numberOfMissingPdus;
-
-   /** PDU sequence numbers that were missing */
-   protected byte[]  missingPduSequenceNumbers = new byte[0]; 
-
-
-/** Constructor */
- public MinefieldResponseNACKPdu()
- {
-    setPduType( DISPDUType.MINEFIELD_RESPONSE_NACK );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += minefieldID.getMarshalledSize();
-   marshalSize += requestingEntityID.getMarshalledSize();
-   marshalSize += 1;  // requestID
-   marshalSize += 1;  // numberOfMissingPdus
-   marshalSize += missingPduSequenceNumbers.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldResponseNACKPdu#minefieldID}*/
-public MinefieldResponseNACKPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
-    minefieldID = pMinefieldID;
-    return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
-{
-    return minefieldID; 
-}
-
-/** Setter for {@link MinefieldResponseNACKPdu#requestingEntityID}*/
-public MinefieldResponseNACKPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
-{
-    requestingEntityID = pRequestingEntityID;
-    return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#requestingEntityID}*/
-public SimulationIdentifier getRequestingEntityID()
-{
-    return requestingEntityID; 
-}
-
-/** Setter for {@link MinefieldResponseNACKPdu#requestID}*/
-public MinefieldResponseNACKPdu setRequestID(byte pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#requestID}*/
-public byte getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link MinefieldResponseNACKPdu#missingPduSequenceNumbers}*/
-public MinefieldResponseNACKPdu setMissingPduSequenceNumbers(byte[] pMissingPduSequenceNumbers)
-{
-    missingPduSequenceNumbers = pMissingPduSequenceNumbers;
-    return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#missingPduSequenceNumbers}*/
-public byte[] getMissingPduSequenceNumbers()
-{
-    return missingPduSequenceNumbers; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       minefieldID.marshal(dos);
-       requestingEntityID.marshal(dos);
-       dos.writeByte(requestID);
-       dos.writeByte(missingPduSequenceNumbers.length);
-
-       for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
-           dos.writeByte(missingPduSequenceNumbers[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += minefieldID.unmarshal(dis);
-        uPosition += requestingEntityID.unmarshal(dis);
-        requestID = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfMissingPdus = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
-            missingPduSequenceNumbers[idx] = dis.readByte();
-        uPosition += (missingPduSequenceNumbers.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   minefieldID.marshal(buff);
-   requestingEntityID.marshal(buff);
-   buff.put( (byte)requestID);
-   buff.put( (byte)missingPduSequenceNumbers.length);
-
-   for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
-       buff.put((byte)missingPduSequenceNumbers[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    minefieldID.unmarshal(buff);
-    requestingEntityID.unmarshal(buff);
-    requestID = (byte)(buff.get() & 0xFF);
-    numberOfMissingPdus = (byte)(buff.get() & 0xFF);
-    for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
-        missingPduSequenceNumbers[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldResponseNACKPdu rhs = (MinefieldResponseNACKPdu)obj;
-
-     if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
-     if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(missingPduSequenceNumbers[idx] == rhs.missingPduSequenceNumbers[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" minefieldID: ").append(minefieldID).append("\n");
-    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" missingPduSequenceNumbers: ").append("\n");
-    sb.append(Arrays.toString(missingPduSequenceNumbers)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
deleted file mode 100644
index 4b89220b966761e0aeac912e0d7fd41477f6a619..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about a minefield sensor. Section 6.2.57
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MinefieldSensorType extends Object implements Serializable
-{
-   /** sensor type. bit fields 0-3 are the type category, 4-15 are teh subcategory */
-   protected short  sensorType;
-
-
-/** Constructor */
- public MinefieldSensorType()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // sensorType
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldSensorType#sensorType}*/
-public MinefieldSensorType setSensorType(short pSensorType)
-{
-    sensorType = pSensorType;
-    return this;
-}
-
-/** Getter for {@link MinefieldSensorType#sensorType}*/
-public short getSensorType()
-{
-    return sensorType; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(sensorType);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        sensorType = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)sensorType);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    sensorType = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldSensorType rhs = (MinefieldSensorType)obj;
-
-     if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" sensorType: ").append(sensorType).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
deleted file mode 100644
index dd2fc921748eeb7a2e12be225b28d630b4f4c68e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.2 Communicate information about the minefield, including the location, perimeter, and types of mines contained within it.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MinefieldStatePdu extends MinefieldFamilyPdu implements Serializable
-{
-   /** Minefield ID */
-   protected MinefieldIdentifier  minefieldID = new MinefieldIdentifier(); 
-
-   /** Minefield sequence */
-   protected short  minefieldSequence;
-
-   /** force ID uid 6 */
-   protected ForceID forceID = ForceID.values()[0];
-
-   /** Number of permieter points */
-   protected byte  numberOfPerimeterPoints;
-
-   /** type of minefield */
-   protected EntityType  minefieldType = new EntityType(); 
-
-   /** how many mine types */
-   protected short  numberOfMineTypes;
-
-   /** location of center of minefield in world coords */
-   protected Vector3Double  minefieldLocation = new Vector3Double(); 
-
-   /** orientation of minefield */
-   protected EulerAngles  minefieldOrientation = new EulerAngles(); 
-
-   /** appearance bitflags uid 190 */
-   protected MinefieldStateAppearanceBitMap appearance = new MinefieldStateAppearanceBitMap();
-
-   /** protocolMode. First two bits are the protocol mode, 14 bits reserved. */
-   protected ProtocolMode  protocolMode = new ProtocolMode(); 
-
-   /** perimeter points for the minefield */
-   protected List< Vector2Float > perimeterPoints = new ArrayList< Vector2Float >();
- 
-   /** Type of mines */
-   protected List< EntityType > mineType = new ArrayList< EntityType >();
- 
-
-/** Constructor */
- public MinefieldStatePdu()
- {
-    setPduType( DISPDUType.MINEFIELD_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += minefieldID.getMarshalledSize();
-   marshalSize += 2;  // minefieldSequence
-   marshalSize += forceID.getMarshalledSize();
-   marshalSize += 1;  // numberOfPerimeterPoints
-   marshalSize += minefieldType.getMarshalledSize();
-   marshalSize += 2;  // numberOfMineTypes
-   marshalSize += minefieldLocation.getMarshalledSize();
-   marshalSize += minefieldOrientation.getMarshalledSize();
-   marshalSize += appearance.getMarshalledSize();
-   marshalSize += protocolMode.getMarshalledSize();
-   for(int idx=0; idx < perimeterPoints.size(); idx++)
-   {
-        Vector2Float listElement = perimeterPoints.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < mineType.size(); idx++)
-   {
-        EntityType listElement = mineType.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldStatePdu#minefieldID}*/
-public MinefieldStatePdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
-    minefieldID = pMinefieldID;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
-{
-    return minefieldID; 
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldSequence}*/
-public MinefieldStatePdu setMinefieldSequence(short pMinefieldSequence)
-{
-    minefieldSequence = pMinefieldSequence;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldSequence}*/
-public short getMinefieldSequence()
-{
-    return minefieldSequence; 
-}
-
-/** Setter for {@link MinefieldStatePdu#forceID}*/
-public MinefieldStatePdu setForceID(ForceID pForceID)
-{
-    forceID = pForceID;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#forceID}*/
-public ForceID getForceID()
-{
-    return forceID; 
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldType}*/
-public MinefieldStatePdu setMinefieldType(EntityType pMinefieldType)
-{
-    minefieldType = pMinefieldType;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldType}*/
-public EntityType getMinefieldType()
-{
-    return minefieldType; 
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldLocation}*/
-public MinefieldStatePdu setMinefieldLocation(Vector3Double pMinefieldLocation)
-{
-    minefieldLocation = pMinefieldLocation;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldLocation}*/
-public Vector3Double getMinefieldLocation()
-{
-    return minefieldLocation; 
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldOrientation}*/
-public MinefieldStatePdu setMinefieldOrientation(EulerAngles pMinefieldOrientation)
-{
-    minefieldOrientation = pMinefieldOrientation;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldOrientation}*/
-public EulerAngles getMinefieldOrientation()
-{
-    return minefieldOrientation; 
-}
-
-/** Setter for {@link MinefieldStatePdu#appearance}*/
-public MinefieldStatePdu setAppearance(MinefieldStateAppearanceBitMap pAppearance)
-{
-    appearance = pAppearance;
-    return this;
-}
-
-/** Setter for {@link MinefieldStatePdu#appearance}*/
-public MinefieldStateAppearanceBitMap getAppearance()
-{
-    return appearance; 
-}
-
-/** Setter for {@link MinefieldStatePdu#protocolMode}*/
-public MinefieldStatePdu setProtocolMode(ProtocolMode pProtocolMode)
-{
-    protocolMode = pProtocolMode;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#protocolMode}*/
-public ProtocolMode getProtocolMode()
-{
-    return protocolMode; 
-}
-
-/** Setter for {@link MinefieldStatePdu#perimeterPoints}*/
-public MinefieldStatePdu setPerimeterPoints(List<Vector2Float> pPerimeterPoints)
-{
-    perimeterPoints = pPerimeterPoints;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#perimeterPoints}*/
-public List<Vector2Float> getPerimeterPoints()
-{
-    return perimeterPoints; 
-}
-
-/** Setter for {@link MinefieldStatePdu#mineType}*/
-public MinefieldStatePdu setMineType(List<EntityType> pMineType)
-{
-    mineType = pMineType;
-    return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#mineType}*/
-public List<EntityType> getMineType()
-{
-    return mineType; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       minefieldID.marshal(dos);
-       dos.writeShort(minefieldSequence);
-       forceID.marshal(dos);
-       dos.writeByte(perimeterPoints.size());
-       minefieldType.marshal(dos);
-       dos.writeShort(mineType.size());
-       minefieldLocation.marshal(dos);
-       minefieldOrientation.marshal(dos);
-       appearance.marshal(dos);
-       protocolMode.marshal(dos);
-
-       for(int idx = 0; idx < perimeterPoints.size(); idx++)
-       {
-            Vector2Float aVector2Float = perimeterPoints.get(idx);
-            aVector2Float.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < mineType.size(); idx++)
-       {
-            EntityType aEntityType = mineType.get(idx);
-            aEntityType.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += minefieldID.unmarshal(dis);
-        minefieldSequence = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        forceID = ForceID.unmarshalEnum(dis);
-        uPosition += forceID.getMarshalledSize();
-        numberOfPerimeterPoints = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += minefieldType.unmarshal(dis);
-        numberOfMineTypes = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += minefieldLocation.unmarshal(dis);
-        uPosition += minefieldOrientation.unmarshal(dis);
-        uPosition += appearance.unmarshal(dis);
-        uPosition += protocolMode.unmarshal(dis);
-        for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
-        {
-            Vector2Float anX = new Vector2Float();
-            uPosition += anX.unmarshal(dis);
-            perimeterPoints.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfMineTypes; idx++)
-        {
-            EntityType anX = new EntityType();
-            uPosition += anX.unmarshal(dis);
-            mineType.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   minefieldID.marshal(buff);
-   buff.putShort( (short)minefieldSequence);
-   forceID.marshal(buff);
-   buff.put( (byte)perimeterPoints.size());
-   minefieldType.marshal(buff);
-   buff.putShort( (short)mineType.size());
-   minefieldLocation.marshal(buff);
-   minefieldOrientation.marshal(buff);
-   appearance.marshal(buff);
-   protocolMode.marshal(buff);
-
-   for(int idx = 0; idx < perimeterPoints.size(); idx++)
-   {
-        Vector2Float aVector2Float = perimeterPoints.get(idx);
-        aVector2Float.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < mineType.size(); idx++)
-   {
-        EntityType aEntityType = mineType.get(idx);
-        aEntityType.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    minefieldID.unmarshal(buff);
-    minefieldSequence = (short)(buff.getShort() & 0xFFFF);
-    forceID = ForceID.unmarshalEnum(buff);
-    numberOfPerimeterPoints = (byte)(buff.get() & 0xFF);
-    minefieldType.unmarshal(buff);
-    numberOfMineTypes = (short)(buff.getShort() & 0xFFFF);
-    minefieldLocation.unmarshal(buff);
-    minefieldOrientation.unmarshal(buff);
-    appearance.unmarshal(buff);
-    protocolMode.unmarshal(buff);
-    for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
-    {
-    Vector2Float anX = new Vector2Float();
-    anX.unmarshal(buff);
-    perimeterPoints.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfMineTypes; idx++)
-    {
-    EntityType anX = new EntityType();
-    anX.unmarshal(buff);
-    mineType.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MinefieldStatePdu rhs = (MinefieldStatePdu)obj;
-
-     if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
-     if( ! (minefieldSequence == rhs.minefieldSequence)) ivarsEqual = false;
-     if( ! (forceID == rhs.forceID)) ivarsEqual = false;
-     if( ! (minefieldType.equals( rhs.minefieldType) )) ivarsEqual = false;
-     if( ! (minefieldLocation.equals( rhs.minefieldLocation) )) ivarsEqual = false;
-     if( ! (minefieldOrientation.equals( rhs.minefieldOrientation) )) ivarsEqual = false;
-     if( ! (appearance.equals( rhs.appearance) )) ivarsEqual = false;
-     if( ! (protocolMode.equals( rhs.protocolMode) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < perimeterPoints.size(); idx++)
-        if( ! ( perimeterPoints.get(idx).equals(rhs.perimeterPoints.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < mineType.size(); idx++)
-        if( ! ( mineType.get(idx).equals(rhs.mineType.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" minefieldID: ").append(minefieldID).append("\n");
-    sb.append(" minefieldSequence: ").append(minefieldSequence).append("\n");
-    sb.append(" forceID: ").append(forceID).append("\n");
-    sb.append(" minefieldType: ").append(minefieldType).append("\n");
-    sb.append(" minefieldLocation: ").append(minefieldLocation).append("\n");
-    sb.append(" minefieldOrientation: ").append(minefieldOrientation).append("\n");
-    sb.append(" appearance: ").append(appearance).append("\n");
-    sb.append(" protocolMode: ").append(protocolMode).append("\n");
-    sb.append(" perimeterPoints: ").append("\n");
-    perimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" mineType: ").append("\n");
-    mineType.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ModulationParameters.java b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
deleted file mode 100644
index bd37e999009a13e0dcc0cfceea1feb671dec976c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ModulationParameters.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Modulation parameters associated with a specific radio system.  6.2.58 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ModulationParameters extends Object implements Serializable
-{
-   protected byte[]  recordSpecificFields = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public ModulationParameters()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordSpecificFields.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ModulationParameters#recordSpecificFields}*/
-public ModulationParameters setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
-    recordSpecificFields = pRecordSpecificFields;
-    return this;
-}
-
-/** Getter for {@link ModulationParameters#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
-{
-    return recordSpecificFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-
-       for(int idx = 0; idx < recordSpecificFields.length; idx++)
-           dos.writeByte(recordSpecificFields[idx]);
-
-       padding = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        for(int idx = 0; idx < recordSpecificFields.length; idx++)
-            recordSpecificFields[idx] = dis.readByte();
-        uPosition += (recordSpecificFields.length * 1);
-        padding = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-
-   for(int idx = 0; idx < recordSpecificFields.length; idx++)
-       buff.put((byte)recordSpecificFields[idx]);
-
-   padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    for(int idx = 0; idx < recordSpecificFields.length; idx++)
-        recordSpecificFields[idx] = buff.get();
-    padding = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ModulationParameters rhs = (ModulationParameters)obj;
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordSpecificFields: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ModulationType.java b/src-generated/edu/nps/moves/dis7/ModulationType.java
deleted file mode 100644
index 533e7dd34c61ec0c9e359b8f720725e8c35ad4f1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ModulationType.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about the type of modulation used for radio transmission. 6.2.59 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ModulationType extends Object implements Serializable
-{
-   /** This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bit field. 0=freq hopping, 1=psuedo noise, time hopping=2, reamining bits unused */
-   protected short  spreadSpectrum;
-
-   /** the major classification of the modulation type.  UID 155 */
-   protected TransmitterMajorModulation majorModulation = TransmitterMajorModulation.values()[0];
-
-   /** provide certain detailed information depending upon the major modulation type, uid 156-162 */
-   protected short  detail;
-
-   /** the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system. uid =163 */
-   protected TransmitterModulationTypeSystem radioSystem = TransmitterModulationTypeSystem.values()[0];
-
-
-/** Constructor */
- public ModulationType()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // spreadSpectrum
-   marshalSize += majorModulation.getMarshalledSize();
-   marshalSize += 2;  // detail
-   marshalSize += radioSystem.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ModulationType#spreadSpectrum}*/
-public ModulationType setSpreadSpectrum(short pSpreadSpectrum)
-{
-    spreadSpectrum = pSpreadSpectrum;
-    return this;
-}
-
-/** Getter for {@link ModulationType#spreadSpectrum}*/
-public short getSpreadSpectrum()
-{
-    return spreadSpectrum; 
-}
-
-/** Setter for {@link ModulationType#majorModulation}*/
-public ModulationType setMajorModulation(TransmitterMajorModulation pMajorModulation)
-{
-    majorModulation = pMajorModulation;
-    return this;
-}
-
-/** Getter for {@link ModulationType#majorModulation}*/
-public TransmitterMajorModulation getMajorModulation()
-{
-    return majorModulation; 
-}
-
-/** Setter for {@link ModulationType#detail}*/
-public ModulationType setDetail(short pDetail)
-{
-    detail = pDetail;
-    return this;
-}
-
-/** Getter for {@link ModulationType#detail}*/
-public short getDetail()
-{
-    return detail; 
-}
-
-/** Setter for {@link ModulationType#radioSystem}*/
-public ModulationType setRadioSystem(TransmitterModulationTypeSystem pRadioSystem)
-{
-    radioSystem = pRadioSystem;
-    return this;
-}
-
-/** Getter for {@link ModulationType#radioSystem}*/
-public TransmitterModulationTypeSystem getRadioSystem()
-{
-    return radioSystem; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(spreadSpectrum);
-       majorModulation.marshal(dos);
-       dos.writeShort(detail);
-       radioSystem.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        spreadSpectrum = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        majorModulation = TransmitterMajorModulation.unmarshalEnum(dis);
-        uPosition += majorModulation.getMarshalledSize();
-        detail = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        radioSystem = TransmitterModulationTypeSystem.unmarshalEnum(dis);
-        uPosition += radioSystem.getMarshalledSize();
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)spreadSpectrum);
-   majorModulation.marshal(buff);
-   buff.putShort( (short)detail);
-   radioSystem.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    spreadSpectrum = (short)(buff.getShort() & 0xFFFF);
-    majorModulation = TransmitterMajorModulation.unmarshalEnum(buff);
-    detail = (short)(buff.getShort() & 0xFFFF);
-    radioSystem = TransmitterModulationTypeSystem.unmarshalEnum(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ModulationType rhs = (ModulationType)obj;
-
-     if( ! (spreadSpectrum == rhs.spreadSpectrum)) ivarsEqual = false;
-     if( ! (majorModulation == rhs.majorModulation)) ivarsEqual = false;
-     if( ! (detail == rhs.detail)) ivarsEqual = false;
-     if( ! (radioSystem == rhs.radioSystem)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" spreadSpectrum: ").append(spreadSpectrum).append("\n");
-    sb.append(" majorModulation: ").append(majorModulation).append("\n");
-    sb.append(" detail: ").append(detail).append("\n");
-    sb.append(" radioSystem: ").append(radioSystem).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Munition.java b/src-generated/edu/nps/moves/dis7/Munition.java
deleted file mode 100644
index 6738ec333e08eb13031055ecd1defaa63f7e8efa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Munition.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Munition extends Object implements Serializable
-{
-   /**  This field shall identify the entity type of the munition. See section 6.2.30. */
-   protected EntityType  munitionType = new EntityType(); 
-
-   /** the station or launcher to which the munition is assigned. See Annex I */
-   protected int  station;
-
-   /** the quantity remaining of this munition. */
-   protected short  quantity;
-
-   /**  the status of the munition. It shall be represented by an 8-bit enumeration.  uid 327 */
-   protected MunitionExpendableStatus munitionStatus = MunitionExpendableStatus.values()[0];
-
-   /** padding  */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public Munition()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += munitionType.getMarshalledSize();
-   marshalSize += 4;  // station
-   marshalSize += 2;  // quantity
-   marshalSize += munitionStatus.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Munition#munitionType}*/
-public Munition setMunitionType(EntityType pMunitionType)
-{
-    munitionType = pMunitionType;
-    return this;
-}
-
-/** Getter for {@link Munition#munitionType}*/
-public EntityType getMunitionType()
-{
-    return munitionType; 
-}
-
-/** Setter for {@link Munition#station}*/
-public Munition setStation(int pStation)
-{
-    station = pStation;
-    return this;
-}
-
-/** Getter for {@link Munition#station}*/
-public int getStation()
-{
-    return station; 
-}
-
-/** Setter for {@link Munition#quantity}*/
-public Munition setQuantity(short pQuantity)
-{
-    quantity = pQuantity;
-    return this;
-}
-
-/** Getter for {@link Munition#quantity}*/
-public short getQuantity()
-{
-    return quantity; 
-}
-
-/** Setter for {@link Munition#munitionStatus}*/
-public Munition setMunitionStatus(MunitionExpendableStatus pMunitionStatus)
-{
-    munitionStatus = pMunitionStatus;
-    return this;
-}
-
-/** Getter for {@link Munition#munitionStatus}*/
-public MunitionExpendableStatus getMunitionStatus()
-{
-    return munitionStatus; 
-}
-
-/** Setter for {@link Munition#padding}*/
-public Munition setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link Munition#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       munitionType.marshal(dos);
-       dos.writeInt(station);
-       dos.writeShort(quantity);
-       munitionStatus.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += munitionType.unmarshal(dis);
-        station = dis.readInt();
-        uPosition += 4;
-        quantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        munitionStatus = MunitionExpendableStatus.unmarshalEnum(dis);
-        uPosition += munitionStatus.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   munitionType.marshal(buff);
-   buff.putInt( (int)station);
-   buff.putShort( (short)quantity);
-   munitionStatus.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    munitionType.unmarshal(buff);
-    station = buff.getInt();
-    quantity = (short)(buff.getShort() & 0xFFFF);
-    munitionStatus = MunitionExpendableStatus.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Munition rhs = (Munition)obj;
-
-     if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
-     if( ! (station == rhs.station)) ivarsEqual = false;
-     if( ! (quantity == rhs.quantity)) ivarsEqual = false;
-     if( ! (munitionStatus == rhs.munitionStatus)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" munitionType: ").append(munitionType).append("\n");
-    sb.append(" station: ").append(station).append("\n");
-    sb.append(" quantity: ").append(quantity).append("\n");
-    sb.append(" munitionStatus: ").append(munitionStatus).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
deleted file mode 100644
index 5c6382f4530459bba513604ccaa651069f8b3ebf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Represents the firing or detonation of a munition. Section 6.2.19.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MunitionDescriptor extends Object implements Serializable
-{
-   /** What munition was used in the burst */
-   protected EntityType  munitionType = new EntityType(); 
-
-   /** type of warhead enumeration uid 60 */
-   protected MunitionDescriptorWarhead warhead = MunitionDescriptorWarhead.values()[0];
-
-   /** type of fuse used enumeration uid 61 */
-   protected MunitionDescriptorFuse fuse = MunitionDescriptorFuse.values()[0];
-
-   /** how many of the munition were fired */
-   protected short  quantity;
-
-   /** rate at which the munition was fired */
-   protected short  rate;
-
-
-/** Constructor */
- public MunitionDescriptor()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += munitionType.getMarshalledSize();
-   marshalSize += warhead.getMarshalledSize();
-   marshalSize += fuse.getMarshalledSize();
-   marshalSize += 2;  // quantity
-   marshalSize += 2;  // rate
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MunitionDescriptor#munitionType}*/
-public MunitionDescriptor setMunitionType(EntityType pMunitionType)
-{
-    munitionType = pMunitionType;
-    return this;
-}
-
-/** Getter for {@link MunitionDescriptor#munitionType}*/
-public EntityType getMunitionType()
-{
-    return munitionType; 
-}
-
-/** Setter for {@link MunitionDescriptor#warhead}*/
-public MunitionDescriptor setWarhead(MunitionDescriptorWarhead pWarhead)
-{
-    warhead = pWarhead;
-    return this;
-}
-
-/** Getter for {@link MunitionDescriptor#warhead}*/
-public MunitionDescriptorWarhead getWarhead()
-{
-    return warhead; 
-}
-
-/** Setter for {@link MunitionDescriptor#fuse}*/
-public MunitionDescriptor setFuse(MunitionDescriptorFuse pFuse)
-{
-    fuse = pFuse;
-    return this;
-}
-
-/** Getter for {@link MunitionDescriptor#fuse}*/
-public MunitionDescriptorFuse getFuse()
-{
-    return fuse; 
-}
-
-/** Setter for {@link MunitionDescriptor#quantity}*/
-public MunitionDescriptor setQuantity(short pQuantity)
-{
-    quantity = pQuantity;
-    return this;
-}
-
-/** Getter for {@link MunitionDescriptor#quantity}*/
-public short getQuantity()
-{
-    return quantity; 
-}
-
-/** Setter for {@link MunitionDescriptor#rate}*/
-public MunitionDescriptor setRate(short pRate)
-{
-    rate = pRate;
-    return this;
-}
-
-/** Getter for {@link MunitionDescriptor#rate}*/
-public short getRate()
-{
-    return rate; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       munitionType.marshal(dos);
-       warhead.marshal(dos);
-       fuse.marshal(dos);
-       dos.writeShort(quantity);
-       dos.writeShort(rate);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += munitionType.unmarshal(dis);
-        warhead = MunitionDescriptorWarhead.unmarshalEnum(dis);
-        uPosition += warhead.getMarshalledSize();
-        fuse = MunitionDescriptorFuse.unmarshalEnum(dis);
-        uPosition += fuse.getMarshalledSize();
-        quantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        rate = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   munitionType.marshal(buff);
-   warhead.marshal(buff);
-   fuse.marshal(buff);
-   buff.putShort( (short)quantity);
-   buff.putShort( (short)rate);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    munitionType.unmarshal(buff);
-    warhead = MunitionDescriptorWarhead.unmarshalEnum(buff);
-    fuse = MunitionDescriptorFuse.unmarshalEnum(buff);
-    quantity = (short)(buff.getShort() & 0xFFFF);
-    rate = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MunitionDescriptor rhs = (MunitionDescriptor)obj;
-
-     if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
-     if( ! (warhead == rhs.warhead)) ivarsEqual = false;
-     if( ! (fuse == rhs.fuse)) ivarsEqual = false;
-     if( ! (quantity == rhs.quantity)) ivarsEqual = false;
-     if( ! (rate == rhs.rate)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" munitionType: ").append(munitionType).append("\n");
-    sb.append(" warhead: ").append(warhead).append("\n");
-    sb.append(" fuse: ").append(fuse).append("\n");
-    sb.append(" quantity: ").append(quantity).append("\n");
-    sb.append(" rate: ").append(rate).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MunitionReload.java b/src-generated/edu/nps/moves/dis7/MunitionReload.java
deleted file mode 100644
index 3fabc38b5fc2c884faa766a9ba2f15413db08a5e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/MunitionReload.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class MunitionReload extends Object implements Serializable
-{
-   /**  This field shall identify the entity type of the munition. See section 6.2.30. */
-   protected EntityType  munitionType = new EntityType(); 
-
-   /** the station or launcher to which the munition is assigned. See Annex I */
-   protected int  station;
-
-   /** the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified. */
-   protected short  standardQuantity;
-
-   /** the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified  */
-   protected short  maximumQuantity;
-
-   /** numer of seconds of sim time required to reload the std qty */
-   protected int  standardQuantityReloadTime;
-
-   /** the number of seconds of sim time required to reload the max possible quantity */
-   protected int  maximumQuantityReloadTime;
-
-
-/** Constructor */
- public MunitionReload()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += munitionType.getMarshalledSize();
-   marshalSize += 4;  // station
-   marshalSize += 2;  // standardQuantity
-   marshalSize += 2;  // maximumQuantity
-   marshalSize += 4;  // standardQuantityReloadTime
-   marshalSize += 4;  // maximumQuantityReloadTime
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link MunitionReload#munitionType}*/
-public MunitionReload setMunitionType(EntityType pMunitionType)
-{
-    munitionType = pMunitionType;
-    return this;
-}
-
-/** Getter for {@link MunitionReload#munitionType}*/
-public EntityType getMunitionType()
-{
-    return munitionType; 
-}
-
-/** Setter for {@link MunitionReload#station}*/
-public MunitionReload setStation(int pStation)
-{
-    station = pStation;
-    return this;
-}
-
-/** Getter for {@link MunitionReload#station}*/
-public int getStation()
-{
-    return station; 
-}
-
-/** Setter for {@link MunitionReload#standardQuantity}*/
-public MunitionReload setStandardQuantity(short pStandardQuantity)
-{
-    standardQuantity = pStandardQuantity;
-    return this;
-}
-
-/** Getter for {@link MunitionReload#standardQuantity}*/
-public short getStandardQuantity()
-{
-    return standardQuantity; 
-}
-
-/** Setter for {@link MunitionReload#maximumQuantity}*/
-public MunitionReload setMaximumQuantity(short pMaximumQuantity)
-{
-    maximumQuantity = pMaximumQuantity;
-    return this;
-}
-
-/** Getter for {@link MunitionReload#maximumQuantity}*/
-public short getMaximumQuantity()
-{
-    return maximumQuantity; 
-}
-
-/** Setter for {@link MunitionReload#standardQuantityReloadTime}*/
-public MunitionReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
-{
-    standardQuantityReloadTime = pStandardQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link MunitionReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
-{
-    return standardQuantityReloadTime; 
-}
-
-/** Setter for {@link MunitionReload#maximumQuantityReloadTime}*/
-public MunitionReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
-{
-    maximumQuantityReloadTime = pMaximumQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link MunitionReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
-{
-    return maximumQuantityReloadTime; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       munitionType.marshal(dos);
-       dos.writeInt(station);
-       dos.writeShort(standardQuantity);
-       dos.writeShort(maximumQuantity);
-       dos.writeInt(standardQuantityReloadTime);
-       dos.writeInt(maximumQuantityReloadTime);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += munitionType.unmarshal(dis);
-        station = dis.readInt();
-        uPosition += 4;
-        standardQuantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        maximumQuantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        standardQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-        maximumQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   munitionType.marshal(buff);
-   buff.putInt( (int)station);
-   buff.putShort( (short)standardQuantity);
-   buff.putShort( (short)maximumQuantity);
-   buff.putInt( (int)standardQuantityReloadTime);
-   buff.putInt( (int)maximumQuantityReloadTime);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    munitionType.unmarshal(buff);
-    station = buff.getInt();
-    standardQuantity = (short)(buff.getShort() & 0xFFFF);
-    maximumQuantity = (short)(buff.getShort() & 0xFFFF);
-    standardQuantityReloadTime = buff.getInt();
-    maximumQuantityReloadTime = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final MunitionReload rhs = (MunitionReload)obj;
-
-     if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
-     if( ! (station == rhs.station)) ivarsEqual = false;
-     if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
-     if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
-     if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
-     if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" munitionType: ").append(munitionType).append("\n");
-    sb.append(" station: ").append(station).append("\n");
-    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
-    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
-    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
-    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
deleted file mode 100644
index b5ea298818e7549dfd34ae9c08709aa38a75f5f8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class NamedLocationIdentification extends Object implements Serializable
-{
-   /** the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part's location data fields. This field shall be specified by a 16-bit enumeration  uid 212 */
-   protected IsPartOfStationName stationName = IsPartOfStationName.values()[0];
-
-   /** the number of the particular wing station, cargo hold etc., at which the part is attached.  */
-   protected short  stationNumber;
-
-
-/** Constructor */
- public NamedLocationIdentification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += stationName.getMarshalledSize();
-   marshalSize += 2;  // stationNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link NamedLocationIdentification#stationName}*/
-public NamedLocationIdentification setStationName(IsPartOfStationName pStationName)
-{
-    stationName = pStationName;
-    return this;
-}
-
-/** Getter for {@link NamedLocationIdentification#stationName}*/
-public IsPartOfStationName getStationName()
-{
-    return stationName; 
-}
-
-/** Setter for {@link NamedLocationIdentification#stationNumber}*/
-public NamedLocationIdentification setStationNumber(short pStationNumber)
-{
-    stationNumber = pStationNumber;
-    return this;
-}
-
-/** Getter for {@link NamedLocationIdentification#stationNumber}*/
-public short getStationNumber()
-{
-    return stationNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       stationName.marshal(dos);
-       dos.writeShort(stationNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        stationName = IsPartOfStationName.unmarshalEnum(dis);
-        uPosition += stationName.getMarshalledSize();
-        stationNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   stationName.marshal(buff);
-   buff.putShort( (short)stationNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    stationName = IsPartOfStationName.unmarshalEnum(buff);
-    stationNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final NamedLocationIdentification rhs = (NamedLocationIdentification)obj;
-
-     if( ! (stationName == rhs.stationName)) ivarsEqual = false;
-     if( ! (stationNumber == rhs.stationNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" stationName: ").append(stationName).append("\n");
-    sb.append(" stationNumber: ").append(stationNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
deleted file mode 100644
index ab00374fdb6b7b8ea3992e7ddb4253f05cec0038..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of an environmental object. Section 6.2.63
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ObjectIdentifier extends Object implements Serializable
-{
-   /**  Simulation Address */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /** object number */
-   protected short  objectNumber;
-
-
-/** Constructor */
- public ObjectIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // objectNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ObjectIdentifier#simulationAddress}*/
-public ObjectIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link ObjectIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link ObjectIdentifier#objectNumber}*/
-public ObjectIdentifier setObjectNumber(short pObjectNumber)
-{
-    objectNumber = pObjectNumber;
-    return this;
-}
-
-/** Getter for {@link ObjectIdentifier#objectNumber}*/
-public short getObjectNumber()
-{
-    return objectNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(objectNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        objectNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)objectNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    objectNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ObjectIdentifier rhs = (ObjectIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (objectNumber == rhs.objectNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" objectNumber: ").append(objectNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ObjectType.java b/src-generated/edu/nps/moves/dis7/ObjectType.java
deleted file mode 100644
index 96e8582f382aab398b10841478765e43258069b3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ObjectType.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of an environmental object. Section 6.2.64
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ObjectType extends Object implements Serializable
-{
-   /** Domain of entity (air, surface, subsurface, space, etc) uid 8 */
-   protected PlatformDomain domain = PlatformDomain.values()[0];
-
-   /** country to which the design of the entity is attributed uid 225 */
-   protected ObjectKind objectKind = ObjectKind.values()[0];
-
-   /** category of entity */
-   protected byte  category;
-
-   /** subcategory of entity */
-   protected byte  subCategory;
-
-
-/** Constructor */
- public ObjectType()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += domain.getMarshalledSize();
-   marshalSize += objectKind.getMarshalledSize();
-   marshalSize += 1;  // category
-   marshalSize += 1;  // subCategory
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ObjectType#domain}*/
-public ObjectType setDomain(PlatformDomain pDomain)
-{
-    domain = pDomain;
-    return this;
-}
-
-/** Getter for {@link ObjectType#domain}*/
-public PlatformDomain getDomain()
-{
-    return domain; 
-}
-
-/** Setter for {@link ObjectType#objectKind}*/
-public ObjectType setObjectKind(ObjectKind pObjectKind)
-{
-    objectKind = pObjectKind;
-    return this;
-}
-
-/** Getter for {@link ObjectType#objectKind}*/
-public ObjectKind getObjectKind()
-{
-    return objectKind; 
-}
-
-/** Setter for {@link ObjectType#category}*/
-public ObjectType setCategory(byte pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link ObjectType#category}*/
-public byte getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link ObjectType#subCategory}*/
-public ObjectType setSubCategory(byte pSubCategory)
-{
-    subCategory = pSubCategory;
-    return this;
-}
-
-/** Getter for {@link ObjectType#subCategory}*/
-public byte getSubCategory()
-{
-    return subCategory; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       domain.marshal(dos);
-       objectKind.marshal(dos);
-       dos.writeByte(category);
-       dos.writeByte(subCategory);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        domain = PlatformDomain.unmarshalEnum(dis);
-        uPosition += domain.getMarshalledSize();
-        objectKind = ObjectKind.unmarshalEnum(dis);
-        uPosition += objectKind.getMarshalledSize();
-        category = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        subCategory = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   domain.marshal(buff);
-   objectKind.marshal(buff);
-   buff.put( (byte)category);
-   buff.put( (byte)subCategory);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    domain = PlatformDomain.unmarshalEnum(buff);
-    objectKind = ObjectKind.unmarshalEnum(buff);
-    category = (byte)(buff.get() & 0xFF);
-    subCategory = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ObjectType rhs = (ObjectType)obj;
-
-     if( ! (domain == rhs.domain)) ivarsEqual = false;
-     if( ! (objectKind == rhs.objectKind)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" domain: ").append(domain).append("\n");
-    sb.append(" objectKind: ").append(objectKind).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subCategory: ").append(subCategory).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
deleted file mode 100644
index 46d34c89a54916d352ad2bb9646f714ac807a8b1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class OwnershipStatusRecord extends Object implements Serializable
-{
-   /** EntityID */
-   protected EntityID  entityId = new EntityID(); 
-
-   /** The ownership and/or ownership conflict status of the entity represented by the Entity ID field. uid 332 */
-   protected OwnershipStatus ownershipStatus = OwnershipStatus.values()[0];
-
-   /** padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public OwnershipStatusRecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityId.getMarshalledSize();
-   marshalSize += ownershipStatus.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link OwnershipStatusRecord#entityId}*/
-public OwnershipStatusRecord setEntityId(EntityID pEntityId)
-{
-    entityId = pEntityId;
-    return this;
-}
-
-/** Getter for {@link OwnershipStatusRecord#entityId}*/
-public EntityID getEntityId()
-{
-    return entityId; 
-}
-
-/** Setter for {@link OwnershipStatusRecord#ownershipStatus}*/
-public OwnershipStatusRecord setOwnershipStatus(OwnershipStatus pOwnershipStatus)
-{
-    ownershipStatus = pOwnershipStatus;
-    return this;
-}
-
-/** Getter for {@link OwnershipStatusRecord#ownershipStatus}*/
-public OwnershipStatus getOwnershipStatus()
-{
-    return ownershipStatus; 
-}
-
-/** Setter for {@link OwnershipStatusRecord#padding}*/
-public OwnershipStatusRecord setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link OwnershipStatusRecord#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityId.marshal(dos);
-       ownershipStatus.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += entityId.unmarshal(dis);
-        ownershipStatus = OwnershipStatus.unmarshalEnum(dis);
-        uPosition += ownershipStatus.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityId.marshal(buff);
-   ownershipStatus.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityId.unmarshal(buff);
-    ownershipStatus = OwnershipStatus.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final OwnershipStatusRecord rhs = (OwnershipStatusRecord)obj;
-
-     if( ! (entityId.equals( rhs.entityId) )) ivarsEqual = false;
-     if( ! (ownershipStatus == rhs.ownershipStatus)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityId: ").append(entityId).append("\n");
-    sb.append(" ownershipStatus: ").append(ownershipStatus).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Pdu.java b/src-generated/edu/nps/moves/dis7/Pdu.java
deleted file mode 100644
index a5128cdb727f2a7f8621566ff11da97b0173b69c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Pdu.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Base class of PduBase and LiveEntityPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class Pdu extends Object implements Serializable,Marshaller
-{
-   /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2012 uid 3 */
-   protected DISProtocolVersion protocolVersion = DISProtocolVersion.IEEE_12781_2012;
-
-   /** Exercise ID */
-   protected byte  exerciseID = (byte)0;
-
-   /** Type of pdu, unique for each PDU class uid 4 */
-   protected DISPDUType pduType = DISPDUType.values()[0];
-
-   /** value that refers to the protocol family, eg SimulationManagement, et uid 5 */
-   protected DISProtocolFamily protocolFamily = DISProtocolFamily.values()[0];
-
-   /** Timestamp value */
-   protected int  timestamp;
-
-   /** Length, in bytes, of the PDU */
-   protected short  length;
-
-
-/** Constructor */
- public Pdu()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += protocolVersion.getMarshalledSize();
-   marshalSize += 1;  // exerciseID
-   marshalSize += pduType.getMarshalledSize();
-   marshalSize += protocolFamily.getMarshalledSize();
-   marshalSize += 4;  // timestamp
-   marshalSize += 2;  // length
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Pdu#protocolVersion}*/
-public Pdu setProtocolVersion(DISProtocolVersion pProtocolVersion)
-{
-    protocolVersion = pProtocolVersion;
-    return this;
-}
-
-/** Getter for {@link Pdu#protocolVersion}*/
-public DISProtocolVersion getProtocolVersion()
-{
-    return protocolVersion; 
-}
-
-/** Setter for {@link Pdu#exerciseID}*/
-public Pdu setExerciseID(byte pExerciseID)
-{
-    exerciseID = pExerciseID;
-    return this;
-}
-
-/** Getter for {@link Pdu#exerciseID}*/
-public byte getExerciseID()
-{
-    return exerciseID; 
-}
-
-/** Setter for {@link Pdu#pduType}*/
-public Pdu setPduType(DISPDUType pPduType)
-{
-    pduType = pPduType;
-    return this;
-}
-
-/** Getter for {@link Pdu#pduType}*/
-public DISPDUType getPduType()
-{
-    return pduType; 
-}
-
-/** Setter for {@link Pdu#protocolFamily}*/
-public Pdu setProtocolFamily(DISProtocolFamily pProtocolFamily)
-{
-    protocolFamily = pProtocolFamily;
-    return this;
-}
-
-/** Getter for {@link Pdu#protocolFamily}*/
-public DISProtocolFamily getProtocolFamily()
-{
-    return protocolFamily; 
-}
-
-/** Setter for {@link Pdu#timestamp}*/
-public Pdu setTimestamp(int pTimestamp)
-{
-    timestamp = pTimestamp;
-    return this;
-}
-
-/** Getter for {@link Pdu#timestamp}*/
-public int getTimestamp()
-{
-    return timestamp; 
-}
-
-/** Setter for {@link Pdu#length}*/
-public Pdu setLength(short pLength)
-{
-    length = pLength;
-    return this;
-}
-
-/** Getter for {@link Pdu#length}*/
-public short getLength()
-{
-    return length; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       protocolVersion.marshal(dos);
-       dos.writeByte(exerciseID);
-       pduType.marshal(dos);
-       protocolFamily.marshal(dos);
-       dos.writeInt(timestamp);
-       dos.writeShort(length);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        protocolVersion = DISProtocolVersion.unmarshalEnum(dis);
-        uPosition += protocolVersion.getMarshalledSize();
-        exerciseID = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pduType = DISPDUType.unmarshalEnum(dis);
-        uPosition += pduType.getMarshalledSize();
-        protocolFamily = DISProtocolFamily.unmarshalEnum(dis);
-        uPosition += protocolFamily.getMarshalledSize();
-        timestamp = dis.readInt();
-        uPosition += 4;
-        length = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   protocolVersion.marshal(buff);
-   buff.put( (byte)exerciseID);
-   pduType.marshal(buff);
-   protocolFamily.marshal(buff);
-   buff.putInt( (int)timestamp);
-   buff.putShort( (short)length);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    protocolVersion = DISProtocolVersion.unmarshalEnum(buff);
-    exerciseID = (byte)(buff.get() & 0xFF);
-    pduType = DISPDUType.unmarshalEnum(buff);
-    protocolFamily = DISProtocolFamily.unmarshalEnum(buff);
-    timestamp = buff.getInt();
-    length = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
-
-/**
- * A convenience method for marshalling to a byte array.
- * This is not as efficient as reusing a ByteBuffer, but it <em>is</em> easy.
- * @return a byte array with the marshalled {@link Pdu}
- * @throws Exception ByteBuffer-generated exception
- */
-public byte[] marshal() throws Exception
-{
-    byte[] data = new byte[getMarshalledSize()];
-    java.nio.ByteBuffer buff = java.nio.ByteBuffer.wrap(data);
-    marshal(buff);
-    return data;
-}
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Pdu rhs = (Pdu)obj;
-
-     if( ! (protocolVersion == rhs.protocolVersion)) ivarsEqual = false;
-     if( ! (exerciseID == rhs.exerciseID)) ivarsEqual = false;
-     if( ! (pduType == rhs.pduType)) ivarsEqual = false;
-     if( ! (protocolFamily == rhs.protocolFamily)) ivarsEqual = false;
-     if( ! (timestamp == rhs.timestamp)) ivarsEqual = false;
-     if( ! (length == rhs.length)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" protocolVersion: ").append(protocolVersion).append("\n");
-    sb.append(" exerciseID: ").append(exerciseID).append("\n");
-    sb.append(" pduType: ").append(pduType).append("\n");
-    sb.append(" protocolFamily: ").append(protocolFamily).append("\n");
-    sb.append(" timestamp: ").append(timestamp).append("\n");
-    sb.append(" length: ").append(length).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PduBase.java b/src-generated/edu/nps/moves/dis7/PduBase.java
deleted file mode 100644
index 92b369013e6944566dfa951e53de2a15eb1e1bb9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/PduBase.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The superclass for all PDUs except LiveEntitys. This incorporates the PduHeader record, section 7.2.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class PduBase extends Pdu implements Serializable
-{
-   /** PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions  */
-   protected PduStatus  pduStatus = new PduStatus(); 
-
-   /** zero-filled array of padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public PduBase()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += pduStatus.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link PduBase#pduStatus}*/
-public PduBase setPduStatus(PduStatus pPduStatus)
-{
-    pduStatus = pPduStatus;
-    return this;
-}
-
-/** Getter for {@link PduBase#pduStatus}*/
-public PduStatus getPduStatus()
-{
-    return pduStatus; 
-}
-
-/** Setter for {@link PduBase#padding}*/
-public PduBase setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link PduBase#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       pduStatus.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += pduStatus.unmarshal(dis);
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   pduStatus.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    pduStatus.unmarshal(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final PduBase rhs = (PduBase)obj;
-
-     if( ! (pduStatus.equals( rhs.pduStatus) )) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" pduStatus: ").append(pduStatus).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PduStatus.java b/src-generated/edu/nps/moves/dis7/PduStatus.java
deleted file mode 100644
index 46ea56d9a0fb442072e3498e7508cc01ebc49e11..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/PduStatus.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-package edu.nps.moves.dis7;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * PduStatus.java, section 6.2.67
- * <p>
- * Sample use:
- * import static edu.nps.moves.dis7.PduStatus.*;
- * All pdus:
- * PduStatus stat = new PduStatus((byte)(CEI_COUPLED | LVC_LIVE));
- * EntityState pdu:
- * PduStatus stat = new PduStatus();
- * stat.setValue((byte)(CEI_NOT_COUPLED | LVC_VIRTUAL | TEI_NO_DIFFERENCE));
- *
- * @author Mike Bailey, jmbailey@nps.edu
- * @version $Id$
- */
-public class PduStatus
-{
-  public static byte TEI_NO_DIFFERENCE = (byte) 0b00000000; // bit 0
-  public static byte TEI_DIFFERENCE = (byte) 0b00000001;
-
-  public static byte LVC_NO_STATEMENT = (byte) 0b00000000; // bits 1-2
-  public static byte LVC_LIVE = (byte) 0b00000010;
-  public static byte LVC_VIRTUAL = (byte) 0b00000100;
-  public static byte LVC_CONSTRUCTIVE = (byte) 0b00000110;
-
-  public static byte CEI_NOT_COUPLED = (byte) 0b00000000; // bit 3
-  public static byte CEI_COUPLED = (byte) 0b00001000;
-
-  public static byte FTI_MUNITION = (byte) 0b00000000; // bit 4
-  public static byte FTI_EXPENDABLE = (byte) 0b00010000;
-
-  public static byte DTI_MUNITION = (byte) 0b00000000; // bits 4-5 
-  public static byte DTI_EXPENDABLE = (byte) 0b00010000;
-  public static byte DTI_NON_MUNITION_EXPLOSION = (byte) 0b00100000;
-
-  public static byte RAI_NO_STATEMENT = (byte) 0b00000000; // bits 4-5
-  public static byte RAI_UNATTACHED = (byte) 0b00010000;
-  public static byte RAI_ATTACHED = (byte) 0b00100000;
-
-  public static byte IAI_NOSTATEMENT = (byte) 0b00000000; // bits 4-5
-  public static byte IAI_UNATTACHED = (byte) 0b00010000;
-  public static byte IAI_ATTACHED = (byte) 0b00100000;
-
-  public static byte ISM_REGENERATION = (byte) 0b00000000; // bit 4
-  public static byte ISM_INTERACTIVE = (byte) 0b00010000;
-
-  public static byte AII_NOT_ACTIVE = (byte) 0b00000000; // bit 5
-  public static byte AII_ACTIVE = (byte) 0b00100000;
-
-  private byte value = 0;
-
-  public PduStatus()
-  {
-  }
-
-  public PduStatus(byte b)
-  {
-    value = b;
-  }
-
-  public void setValue(byte b)
-  {
-    value = b;
-  }
-
-  public byte getValue()
-  {
-    return value;
-  }
-
-  public byte orTo(byte b)
-  {
-    value |= b;
-    return value;
-  }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-  public int getMarshalledSize()
-  {
-    return 1;
-  }
-
-  public void marshal(DataOutputStream dos) throws IOException
-  {
-    dos.writeByte(value);
-  }
-
-  public int unmarshal(DataInputStream dis) throws IOException
-  {
-    value = dis.readByte();
-    return 1;
-  }
-
-  public void marshal(ByteBuffer buff)
-  {
-    buff.put(value);
-  }
-
-  public int unmarshal(ByteBuffer buff)
-  {
-    value = buff.get();
-    return 1;
-  }
-
-  @Override
-  public boolean equals(Object obj)
-  {
-    return obj instanceof PduStatus && ((PduStatus) obj).getValue() == getValue();
-  }
-  
-  @Override
-  public String toString()
-  {
-    return "PduStatus: "+ Integer.toBinaryString(getValue()+256).substring(1); // dont want to lose leading zeros
-  }
-}
diff --git a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
deleted file mode 100644
index a3bd9abb949716e40c88b74ee0ad8639188ef5fa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.4 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a single point.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class PointObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
-   /** Object in synthetic environment */
-   protected EntityID  objectID = new EntityID(); 
-
-   /** Object with which this point object is associated */
-   protected ObjectIdentifier  referencedObjectID = new ObjectIdentifier(); 
-
-   /** unique update number of each state transition of an object */
-   protected int  updateNumber;
-
-   /** force ID uid 6 */
-   protected ForceID forceID = ForceID.values()[0];
-
-   /** modifications uid 240 */
-   protected ObjectStateModificationPointObject modifications = new ObjectStateModificationPointObject();
-
-   /** Object type */
-   protected ObjectType  objectType = new ObjectType(); 
-
-   /** Object location */
-   protected Vector3Double  objectLocation = new Vector3Double(); 
-
-   /** Object orientation */
-   protected EulerAngles  objectOrientation = new EulerAngles(); 
-
-   /** Specific object apperance */
-   protected int  specificObjectAppearance;
-
-   /** General object apperance uid 229 */
-   protected ObjectStateAppearanceGeneral generObjectAppearance = new ObjectStateAppearanceGeneral();
-
-   protected short  padding1;
-
-   /** requesterID */
-   protected SimulationAddress  requesterID = new SimulationAddress(); 
-
-   /** receiver ID */
-   protected SimulationAddress  receivingID = new SimulationAddress(); 
-
-   /** padding */
-   protected int  pad2;
-
-
-/** Constructor */
- public PointObjectStatePdu()
- {
-    setPduType( DISPDUType.POINT_OBJECT_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += objectID.getMarshalledSize();
-   marshalSize += referencedObjectID.getMarshalledSize();
-   marshalSize += 4;  // updateNumber
-   marshalSize += forceID.getMarshalledSize();
-   marshalSize += modifications.getMarshalledSize();
-   marshalSize += objectType.getMarshalledSize();
-   marshalSize += objectLocation.getMarshalledSize();
-   marshalSize += objectOrientation.getMarshalledSize();
-   marshalSize += 4;  // specificObjectAppearance
-   marshalSize += generObjectAppearance.getMarshalledSize();
-   marshalSize += 2;  // padding1
-   marshalSize += requesterID.getMarshalledSize();
-   marshalSize += receivingID.getMarshalledSize();
-   marshalSize += 4;  // pad2
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link PointObjectStatePdu#objectID}*/
-public PointObjectStatePdu setObjectID(EntityID pObjectID)
-{
-    objectID = pObjectID;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectID}*/
-public EntityID getObjectID()
-{
-    return objectID; 
-}
-
-/** Setter for {@link PointObjectStatePdu#referencedObjectID}*/
-public PointObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
-{
-    referencedObjectID = pReferencedObjectID;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#referencedObjectID}*/
-public ObjectIdentifier getReferencedObjectID()
-{
-    return referencedObjectID; 
-}
-
-/** Setter for {@link PointObjectStatePdu#updateNumber}*/
-public PointObjectStatePdu setUpdateNumber(int pUpdateNumber)
-{
-    updateNumber = pUpdateNumber;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#updateNumber}*/
-public int getUpdateNumber()
-{
-    return updateNumber; 
-}
-
-/** Setter for {@link PointObjectStatePdu#forceID}*/
-public PointObjectStatePdu setForceID(ForceID pForceID)
-{
-    forceID = pForceID;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#forceID}*/
-public ForceID getForceID()
-{
-    return forceID; 
-}
-
-/** Setter for {@link PointObjectStatePdu#modifications}*/
-public PointObjectStatePdu setModifications(ObjectStateModificationPointObject pModifications)
-{
-    modifications = pModifications;
-    return this;
-}
-
-/** Setter for {@link PointObjectStatePdu#modifications}*/
-public ObjectStateModificationPointObject getModifications()
-{
-    return modifications; 
-}
-
-/** Setter for {@link PointObjectStatePdu#objectType}*/
-public PointObjectStatePdu setObjectType(ObjectType pObjectType)
-{
-    objectType = pObjectType;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectType}*/
-public ObjectType getObjectType()
-{
-    return objectType; 
-}
-
-/** Setter for {@link PointObjectStatePdu#objectLocation}*/
-public PointObjectStatePdu setObjectLocation(Vector3Double pObjectLocation)
-{
-    objectLocation = pObjectLocation;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectLocation}*/
-public Vector3Double getObjectLocation()
-{
-    return objectLocation; 
-}
-
-/** Setter for {@link PointObjectStatePdu#objectOrientation}*/
-public PointObjectStatePdu setObjectOrientation(EulerAngles pObjectOrientation)
-{
-    objectOrientation = pObjectOrientation;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectOrientation}*/
-public EulerAngles getObjectOrientation()
-{
-    return objectOrientation; 
-}
-
-/** Setter for {@link PointObjectStatePdu#specificObjectAppearance}*/
-public PointObjectStatePdu setSpecificObjectAppearance(int pSpecificObjectAppearance)
-{
-    specificObjectAppearance = pSpecificObjectAppearance;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#specificObjectAppearance}*/
-public int getSpecificObjectAppearance()
-{
-    return specificObjectAppearance; 
-}
-
-/** Setter for {@link PointObjectStatePdu#generObjectAppearance}*/
-public PointObjectStatePdu setGenerObjectAppearance(ObjectStateAppearanceGeneral pGenerObjectAppearance)
-{
-    generObjectAppearance = pGenerObjectAppearance;
-    return this;
-}
-
-/** Setter for {@link PointObjectStatePdu#generObjectAppearance}*/
-public ObjectStateAppearanceGeneral getGenerObjectAppearance()
-{
-    return generObjectAppearance; 
-}
-
-/** Setter for {@link PointObjectStatePdu#padding1}*/
-public PointObjectStatePdu setPadding1(short pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#padding1}*/
-public short getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link PointObjectStatePdu#requesterID}*/
-public PointObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
-{
-    requesterID = pRequesterID;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#requesterID}*/
-public SimulationAddress getRequesterID()
-{
-    return requesterID; 
-}
-
-/** Setter for {@link PointObjectStatePdu#receivingID}*/
-public PointObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
-{
-    receivingID = pReceivingID;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#receivingID}*/
-public SimulationAddress getReceivingID()
-{
-    return receivingID; 
-}
-
-/** Setter for {@link PointObjectStatePdu#pad2}*/
-public PointObjectStatePdu setPad2(int pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#pad2}*/
-public int getPad2()
-{
-    return pad2; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       objectID.marshal(dos);
-       referencedObjectID.marshal(dos);
-       dos.writeInt(updateNumber);
-       forceID.marshal(dos);
-       modifications.marshal(dos);
-       objectType.marshal(dos);
-       objectLocation.marshal(dos);
-       objectOrientation.marshal(dos);
-       dos.writeInt(specificObjectAppearance);
-       generObjectAppearance.marshal(dos);
-       dos.writeShort(padding1);
-       requesterID.marshal(dos);
-       receivingID.marshal(dos);
-       dos.writeInt(pad2);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += objectID.unmarshal(dis);
-        uPosition += referencedObjectID.unmarshal(dis);
-        updateNumber = dis.readInt();
-        uPosition += 4;
-        forceID = ForceID.unmarshalEnum(dis);
-        uPosition += forceID.getMarshalledSize();
-        uPosition += modifications.unmarshal(dis);
-        uPosition += objectType.unmarshal(dis);
-        uPosition += objectLocation.unmarshal(dis);
-        uPosition += objectOrientation.unmarshal(dis);
-        specificObjectAppearance = dis.readInt();
-        uPosition += 4;
-        uPosition += generObjectAppearance.unmarshal(dis);
-        padding1 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += requesterID.unmarshal(dis);
-        uPosition += receivingID.unmarshal(dis);
-        pad2 = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   objectID.marshal(buff);
-   referencedObjectID.marshal(buff);
-   buff.putInt( (int)updateNumber);
-   forceID.marshal(buff);
-   modifications.marshal(buff);
-   objectType.marshal(buff);
-   objectLocation.marshal(buff);
-   objectOrientation.marshal(buff);
-   buff.putInt( (int)specificObjectAppearance);
-   generObjectAppearance.marshal(buff);
-   buff.putShort( (short)padding1);
-   requesterID.marshal(buff);
-   receivingID.marshal(buff);
-   buff.putInt( (int)pad2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    objectID.unmarshal(buff);
-    referencedObjectID.unmarshal(buff);
-    updateNumber = buff.getInt();
-    forceID = ForceID.unmarshalEnum(buff);
-    modifications.unmarshal(buff);
-    objectType.unmarshal(buff);
-    objectLocation.unmarshal(buff);
-    objectOrientation.unmarshal(buff);
-    specificObjectAppearance = buff.getInt();
-    generObjectAppearance.unmarshal(buff);
-    padding1 = (short)(buff.getShort() & 0xFFFF);
-    requesterID.unmarshal(buff);
-    receivingID.unmarshal(buff);
-    pad2 = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final PointObjectStatePdu rhs = (PointObjectStatePdu)obj;
-
-     if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
-     if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
-     if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
-     if( ! (forceID == rhs.forceID)) ivarsEqual = false;
-     if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
-     if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
-     if( ! (objectLocation.equals( rhs.objectLocation) )) ivarsEqual = false;
-     if( ! (objectOrientation.equals( rhs.objectOrientation) )) ivarsEqual = false;
-     if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
-     if( ! (generObjectAppearance.equals( rhs.generObjectAppearance) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
-     if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" objectID: ").append(objectID).append("\n");
-    sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
-    sb.append(" updateNumber: ").append(updateNumber).append("\n");
-    sb.append(" forceID: ").append(forceID).append("\n");
-    sb.append(" modifications: ").append(modifications).append("\n");
-    sb.append(" objectType: ").append(objectType).append("\n");
-    sb.append(" objectLocation: ").append(objectLocation).append("\n");
-    sb.append(" objectOrientation: ").append(objectOrientation).append("\n");
-    sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
-    sb.append(" generObjectAppearance: ").append(generObjectAppearance).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" requesterID: ").append(requesterID).append("\n");
-    sb.append(" receivingID: ").append(receivingID).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
deleted file mode 100644
index e010eed87c35dc5687d7e7b859ee860fc24734dc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class PropulsionSystemData extends Object implements Serializable
-{
-   /** powerSetting */
-   protected float  powerSetting;
-
-   /** engine RPMs */
-   protected float  engineRpm;
-
-
-/** Constructor */
- public PropulsionSystemData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // powerSetting
-   marshalSize += 4;  // engineRpm
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link PropulsionSystemData#powerSetting}*/
-public PropulsionSystemData setPowerSetting(float pPowerSetting)
-{
-    powerSetting = pPowerSetting;
-    return this;
-}
-
-/** Getter for {@link PropulsionSystemData#powerSetting}*/
-public float getPowerSetting()
-{
-    return powerSetting; 
-}
-
-/** Setter for {@link PropulsionSystemData#engineRpm}*/
-public PropulsionSystemData setEngineRpm(float pEngineRpm)
-{
-    engineRpm = pEngineRpm;
-    return this;
-}
-
-/** Getter for {@link PropulsionSystemData#engineRpm}*/
-public float getEngineRpm()
-{
-    return engineRpm; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(powerSetting);
-       dos.writeFloat(engineRpm);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        powerSetting = dis.readFloat();
-        uPosition += 4;
-        engineRpm = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)powerSetting);
-   buff.putFloat( (float)engineRpm);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    powerSetting = buff.getFloat();
-    engineRpm = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final PropulsionSystemData rhs = (PropulsionSystemData)obj;
-
-     if( ! (powerSetting == rhs.powerSetting)) ivarsEqual = false;
-     if( ! (engineRpm == rhs.engineRpm)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" powerSetting: ").append(powerSetting).append("\n");
-    sb.append(" engineRpm: ").append(engineRpm).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ProtocolMode.java b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
deleted file mode 100644
index 9192d4a38500e07fa2cc0d4280c2acbd75f7c1f7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ProtocolMode.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Bit field used to identify minefield data. bits 14-15 are a 2-bit enum, other bits unused. Section 6.2.69
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ProtocolMode extends Object implements Serializable
-{
-   /** Bitfields, 14-15 contain an enum, uid 336 */
-   protected short  protocolMode;
-
-
-/** Constructor */
- public ProtocolMode()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // protocolMode
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ProtocolMode#protocolMode}*/
-public ProtocolMode setProtocolMode(short pProtocolMode)
-{
-    protocolMode = pProtocolMode;
-    return this;
-}
-
-/** Getter for {@link ProtocolMode#protocolMode}*/
-public short getProtocolMode()
-{
-    return protocolMode; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(protocolMode);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        protocolMode = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)protocolMode);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    protocolMode = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ProtocolMode rhs = (ProtocolMode)obj;
-
-     if( ! (protocolMode == rhs.protocolMode)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" protocolMode: ").append(protocolMode).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
deleted file mode 100644
index e25b270d8ac8d7b61b2f7f8535e59725e8956d1e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RadioCommsHeader extends Object implements Serializable
-{
-   /** ID of the entitythat is the source of the communication */
-   protected EntityID  radioReferenceID = new EntityID(); 
-
-   /** particular radio within an entity */
-   protected short  radioNumber;
-
-
-/** Constructor */
- public RadioCommsHeader()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += radioReferenceID.getMarshalledSize();
-   marshalSize += 2;  // radioNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RadioCommsHeader#radioReferenceID}*/
-public RadioCommsHeader setRadioReferenceID(EntityID pRadioReferenceID)
-{
-    radioReferenceID = pRadioReferenceID;
-    return this;
-}
-
-/** Getter for {@link RadioCommsHeader#radioReferenceID}*/
-public EntityID getRadioReferenceID()
-{
-    return radioReferenceID; 
-}
-
-/** Setter for {@link RadioCommsHeader#radioNumber}*/
-public RadioCommsHeader setRadioNumber(short pRadioNumber)
-{
-    radioNumber = pRadioNumber;
-    return this;
-}
-
-/** Getter for {@link RadioCommsHeader#radioNumber}*/
-public short getRadioNumber()
-{
-    return radioNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       radioReferenceID.marshal(dos);
-       dos.writeShort(radioNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += radioReferenceID.unmarshal(dis);
-        radioNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   radioReferenceID.marshal(buff);
-   buff.putShort( (short)radioNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    radioReferenceID.unmarshal(buff);
-    radioNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RadioCommsHeader rhs = (RadioCommsHeader)obj;
-
-     if( ! (radioReferenceID.equals( rhs.radioReferenceID) )) ivarsEqual = false;
-     if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" radioReferenceID: ").append(radioReferenceID).append("\n");
-    sb.append(" radioNumber: ").append(radioNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
deleted file mode 100644
index a316f9ea23914f1d935b15d5624be6d5235f3112..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  Abstract superclass for radio communications PDUs. Section 7.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class RadioCommunicationsFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public RadioCommunicationsFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.RADIO_COMMUNICATIONS );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RadioCommunicationsFamilyPdu rhs = (RadioCommunicationsFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
deleted file mode 100644
index 5d9873b136334d811593cb0b9f2aa16b7e97f39c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of an attached or unattached radio in an event or exercise Section 6.2.70
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RadioIdentifier extends Object implements Serializable
-{
-   /**  site */
-   protected short  siteNumber;
-
-   /** application number */
-   protected short  applicationNumber;
-
-   /**  reference number */
-   protected short  referenceNumber;
-
-   /**  Radio number */
-   protected short  radioNumber;
-
-
-/** Constructor */
- public RadioIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // siteNumber
-   marshalSize += 2;  // applicationNumber
-   marshalSize += 2;  // referenceNumber
-   marshalSize += 2;  // radioNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RadioIdentifier#siteNumber}*/
-public RadioIdentifier setSiteNumber(short pSiteNumber)
-{
-    siteNumber = pSiteNumber;
-    return this;
-}
-
-/** Getter for {@link RadioIdentifier#siteNumber}*/
-public short getSiteNumber()
-{
-    return siteNumber; 
-}
-
-/** Setter for {@link RadioIdentifier#applicationNumber}*/
-public RadioIdentifier setApplicationNumber(short pApplicationNumber)
-{
-    applicationNumber = pApplicationNumber;
-    return this;
-}
-
-/** Getter for {@link RadioIdentifier#applicationNumber}*/
-public short getApplicationNumber()
-{
-    return applicationNumber; 
-}
-
-/** Setter for {@link RadioIdentifier#referenceNumber}*/
-public RadioIdentifier setReferenceNumber(short pReferenceNumber)
-{
-    referenceNumber = pReferenceNumber;
-    return this;
-}
-
-/** Getter for {@link RadioIdentifier#referenceNumber}*/
-public short getReferenceNumber()
-{
-    return referenceNumber; 
-}
-
-/** Setter for {@link RadioIdentifier#radioNumber}*/
-public RadioIdentifier setRadioNumber(short pRadioNumber)
-{
-    radioNumber = pRadioNumber;
-    return this;
-}
-
-/** Getter for {@link RadioIdentifier#radioNumber}*/
-public short getRadioNumber()
-{
-    return radioNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(siteNumber);
-       dos.writeShort(applicationNumber);
-       dos.writeShort(referenceNumber);
-       dos.writeShort(radioNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        siteNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        applicationNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        referenceNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        radioNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)siteNumber);
-   buff.putShort( (short)applicationNumber);
-   buff.putShort( (short)referenceNumber);
-   buff.putShort( (short)radioNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    siteNumber = (short)(buff.getShort() & 0xFFFF);
-    applicationNumber = (short)(buff.getShort() & 0xFFFF);
-    referenceNumber = (short)(buff.getShort() & 0xFFFF);
-    radioNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RadioIdentifier rhs = (RadioIdentifier)obj;
-
-     if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
-     if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
-     if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
-     if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" siteNumber: ").append(siteNumber).append("\n");
-    sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
-    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-    sb.append(" radioNumber: ").append(radioNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioType.java b/src-generated/edu/nps/moves/dis7/RadioType.java
deleted file mode 100644
index b591da0928fcc18b284dee772f6894039c8c3774..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RadioType.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type of radio. Section 6.2.71
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RadioType extends Object implements Serializable
-{
-   /** Kind of entity uid 7 */
-   protected EntityKind entityKind = EntityKind.RADIO;
-
-   /** Domain of entity (air, surface, subsurface, space, etc) */
-   protected byte  domain;
-
-   /** country to which the design of the entity is attributed uid 29 */
-   protected Country country = Country.values()[0];
-
-   /** category of entity uid 22 */
-   protected RadioCategory category = RadioCategory.values()[0];
-
-   /** specific info based on subcategory field uid 23 */
-   protected RadioSubcategory subcategory = RadioSubcategory.values()[0];
-
-   protected byte  specific;
-
-   protected byte  extra;
-
-
-/** Constructor */
- public RadioType()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityKind.getMarshalledSize();
-   marshalSize += 1;  // domain
-   marshalSize += country.getMarshalledSize();
-   marshalSize += category.getMarshalledSize();
-   marshalSize += subcategory.getMarshalledSize();
-   marshalSize += 1;  // specific
-   marshalSize += 1;  // extra
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RadioType#entityKind}*/
-public RadioType setEntityKind(EntityKind pEntityKind)
-{
-    entityKind = pEntityKind;
-    return this;
-}
-
-/** Getter for {@link RadioType#entityKind}*/
-public EntityKind getEntityKind()
-{
-    return entityKind; 
-}
-
-/** Setter for {@link RadioType#domain}*/
-public RadioType setDomain(byte pDomain)
-{
-    domain = pDomain;
-    return this;
-}
-
-/** Getter for {@link RadioType#domain}*/
-public byte getDomain()
-{
-    return domain; 
-}
-
-/** Setter for {@link RadioType#country}*/
-public RadioType setCountry(Country pCountry)
-{
-    country = pCountry;
-    return this;
-}
-
-/** Getter for {@link RadioType#country}*/
-public Country getCountry()
-{
-    return country; 
-}
-
-/** Setter for {@link RadioType#category}*/
-public RadioType setCategory(RadioCategory pCategory)
-{
-    category = pCategory;
-    return this;
-}
-
-/** Getter for {@link RadioType#category}*/
-public RadioCategory getCategory()
-{
-    return category; 
-}
-
-/** Setter for {@link RadioType#subcategory}*/
-public RadioType setSubcategory(RadioSubcategory pSubcategory)
-{
-    subcategory = pSubcategory;
-    return this;
-}
-
-/** Getter for {@link RadioType#subcategory}*/
-public RadioSubcategory getSubcategory()
-{
-    return subcategory; 
-}
-
-/** Setter for {@link RadioType#specific}*/
-public RadioType setSpecific(byte pSpecific)
-{
-    specific = pSpecific;
-    return this;
-}
-
-/** Getter for {@link RadioType#specific}*/
-public byte getSpecific()
-{
-    return specific; 
-}
-
-/** Setter for {@link RadioType#extra}*/
-public RadioType setExtra(byte pExtra)
-{
-    extra = pExtra;
-    return this;
-}
-
-/** Getter for {@link RadioType#extra}*/
-public byte getExtra()
-{
-    return extra; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityKind.marshal(dos);
-       dos.writeByte(domain);
-       country.marshal(dos);
-       category.marshal(dos);
-       subcategory.marshal(dos);
-       dos.writeByte(specific);
-       dos.writeByte(extra);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        entityKind = EntityKind.unmarshalEnum(dis);
-        uPosition += entityKind.getMarshalledSize();
-        domain = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        country = Country.unmarshalEnum(dis);
-        uPosition += country.getMarshalledSize();
-        category = RadioCategory.unmarshalEnum(dis);
-        uPosition += category.getMarshalledSize();
-        subcategory = RadioSubcategory.unmarshalEnum(dis);
-        uPosition += subcategory.getMarshalledSize();
-        specific = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        extra = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityKind.marshal(buff);
-   buff.put( (byte)domain);
-   country.marshal(buff);
-   category.marshal(buff);
-   subcategory.marshal(buff);
-   buff.put( (byte)specific);
-   buff.put( (byte)extra);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityKind = EntityKind.unmarshalEnum(buff);
-    domain = (byte)(buff.get() & 0xFF);
-    country = Country.unmarshalEnum(buff);
-    category = RadioCategory.unmarshalEnum(buff);
-    subcategory = RadioSubcategory.unmarshalEnum(buff);
-    specific = (byte)(buff.get() & 0xFF);
-    extra = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RadioType rhs = (RadioType)obj;
-
-     if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
-     if( ! (domain == rhs.domain)) ivarsEqual = false;
-     if( ! (country == rhs.country)) ivarsEqual = false;
-     if( ! (category == rhs.category)) ivarsEqual = false;
-     if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
-     if( ! (specific == rhs.specific)) ivarsEqual = false;
-     if( ! (extra == rhs.extra)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityKind: ").append(entityKind).append("\n");
-    sb.append(" domain: ").append(domain).append("\n");
-    sb.append(" country: ").append(country).append("\n");
-    sb.append(" category: ").append(category).append("\n");
-    sb.append(" subcategory: ").append(subcategory).append("\n");
-    sb.append(" specific: ").append(specific).append("\n");
-    sb.append(" extra: ").append(extra).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
deleted file mode 100644
index 71af5f4c577758ef17f55c98d59e9c70be17e8d8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.5 Communicates the state of a particular radio receiver. Its primary application is in communicating state information to radio network monitors, data loggers, and similar applications for use in debugging, supervision, and after-action review.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ReceiverPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
-   protected RadioCommsHeader  header = new RadioCommsHeader(); 
-
-   /** encoding scheme used, and enumeration uid 179 */
-   protected ReceiverReceiverState receiverState = ReceiverReceiverState.values()[0];
-
-   protected short  padding1;
-
-   /** received power */
-   protected float  receivedPower;
-
-   /** ID of transmitter */
-   protected EntityID  transmitterEntityId = new EntityID(); 
-
-   /** ID of transmitting radio */
-   protected short  transmitterRadioId;
-
-
-/** Constructor */
- public ReceiverPdu()
- {
-    setPduType( DISPDUType.RECEIVER );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += header.getMarshalledSize();
-   marshalSize += receiverState.getMarshalledSize();
-   marshalSize += 2;  // padding1
-   marshalSize += 4;  // receivedPower
-   marshalSize += transmitterEntityId.getMarshalledSize();
-   marshalSize += 2;  // transmitterRadioId
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ReceiverPdu#header}*/
-public ReceiverPdu setHeader(RadioCommsHeader pHeader)
-{
-    header = pHeader;
-    return this;
-}
-
-/** Getter for {@link ReceiverPdu#header}*/
-public RadioCommsHeader getHeader()
-{
-    return header; 
-}
-
-/** Setter for {@link ReceiverPdu#receiverState}*/
-public ReceiverPdu setReceiverState(ReceiverReceiverState pReceiverState)
-{
-    receiverState = pReceiverState;
-    return this;
-}
-
-/** Getter for {@link ReceiverPdu#receiverState}*/
-public ReceiverReceiverState getReceiverState()
-{
-    return receiverState; 
-}
-
-/** Setter for {@link ReceiverPdu#padding1}*/
-public ReceiverPdu setPadding1(short pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link ReceiverPdu#padding1}*/
-public short getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link ReceiverPdu#receivedPower}*/
-public ReceiverPdu setReceivedPower(float pReceivedPower)
-{
-    receivedPower = pReceivedPower;
-    return this;
-}
-
-/** Getter for {@link ReceiverPdu#receivedPower}*/
-public float getReceivedPower()
-{
-    return receivedPower; 
-}
-
-/** Setter for {@link ReceiverPdu#transmitterEntityId}*/
-public ReceiverPdu setTransmitterEntityId(EntityID pTransmitterEntityId)
-{
-    transmitterEntityId = pTransmitterEntityId;
-    return this;
-}
-
-/** Getter for {@link ReceiverPdu#transmitterEntityId}*/
-public EntityID getTransmitterEntityId()
-{
-    return transmitterEntityId; 
-}
-
-/** Setter for {@link ReceiverPdu#transmitterRadioId}*/
-public ReceiverPdu setTransmitterRadioId(short pTransmitterRadioId)
-{
-    transmitterRadioId = pTransmitterRadioId;
-    return this;
-}
-
-/** Getter for {@link ReceiverPdu#transmitterRadioId}*/
-public short getTransmitterRadioId()
-{
-    return transmitterRadioId; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       header.marshal(dos);
-       receiverState.marshal(dos);
-       dos.writeShort(padding1);
-       dos.writeFloat(receivedPower);
-       transmitterEntityId.marshal(dos);
-       dos.writeShort(transmitterRadioId);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += header.unmarshal(dis);
-        receiverState = ReceiverReceiverState.unmarshalEnum(dis);
-        uPosition += receiverState.getMarshalledSize();
-        padding1 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        receivedPower = dis.readFloat();
-        uPosition += 4;
-        uPosition += transmitterEntityId.unmarshal(dis);
-        transmitterRadioId = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   header.marshal(buff);
-   receiverState.marshal(buff);
-   buff.putShort( (short)padding1);
-   buff.putFloat( (float)receivedPower);
-   transmitterEntityId.marshal(buff);
-   buff.putShort( (short)transmitterRadioId);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    header.unmarshal(buff);
-    receiverState = ReceiverReceiverState.unmarshalEnum(buff);
-    padding1 = (short)(buff.getShort() & 0xFFFF);
-    receivedPower = buff.getFloat();
-    transmitterEntityId.unmarshal(buff);
-    transmitterRadioId = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ReceiverPdu rhs = (ReceiverPdu)obj;
-
-     if( ! (header.equals( rhs.header) )) ivarsEqual = false;
-     if( ! (receiverState == rhs.receiverState)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (receivedPower == rhs.receivedPower)) ivarsEqual = false;
-     if( ! (transmitterEntityId.equals( rhs.transmitterEntityId) )) ivarsEqual = false;
-     if( ! (transmitterRadioId == rhs.transmitterRadioId)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" header: ").append(header).append("\n");
-    sb.append(" receiverState: ").append(receiverState).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" receivedPower: ").append(receivedPower).append("\n");
-    sb.append(" transmitterEntityId: ").append(transmitterEntityId).append("\n");
-    sb.append(" transmitterRadioId: ").append(transmitterRadioId).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
deleted file mode 100644
index 15d23e6a433ba7190db6c95bf8ebdc286961f9b3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.14 Used to communicate a request for data in record format.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** request ID */
-   protected int  requestID;
-
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   /** padding */
-   protected byte  pad1;
-
-   /** event type uid 334 */
-   protected RecordQueryREventType eventType = RecordQueryREventType.values()[0];
-
-   /** time */
-   protected int  time;
-
-   /** numberOfRecords */
-   protected int  numberOfRecords;
-
-   /** record IDs */
-   protected List< RecordQuerySpecification > recordIDs = new ArrayList< RecordQuerySpecification >();
- 
-
-/** Constructor */
- public RecordQueryRPdu()
- {
-    setPduType( DISPDUType.RECORD_QUERY_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += eventType.getMarshalledSize();
-   marshalSize += 4;  // time
-   marshalSize += 4;  // numberOfRecords
-   for(int idx=0; idx < recordIDs.size(); idx++)
-   {
-        RecordQuerySpecification listElement = recordIDs.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RecordQueryRPdu#requestID}*/
-public RecordQueryRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link RecordQueryRPdu#requiredReliabilityService}*/
-public RecordQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link RecordQueryRPdu#pad1}*/
-public RecordQueryRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link RecordQueryRPdu#eventType}*/
-public RecordQueryRPdu setEventType(RecordQueryREventType pEventType)
-{
-    eventType = pEventType;
-    return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#eventType}*/
-public RecordQueryREventType getEventType()
-{
-    return eventType; 
-}
-
-/** Setter for {@link RecordQueryRPdu#time}*/
-public RecordQueryRPdu setTime(int pTime)
-{
-    time = pTime;
-    return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#time}*/
-public int getTime()
-{
-    return time; 
-}
-
-/** Setter for {@link RecordQueryRPdu#recordIDs}*/
-public RecordQueryRPdu setRecordIDs(List<RecordQuerySpecification> pRecordIDs)
-{
-    recordIDs = pRecordIDs;
-    return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#recordIDs}*/
-public List<RecordQuerySpecification> getRecordIDs()
-{
-    return recordIDs; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       eventType.marshal(dos);
-       dos.writeInt(time);
-       dos.writeInt(recordIDs.size());
-
-       for(int idx = 0; idx < recordIDs.size(); idx++)
-       {
-            RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
-            aRecordQuerySpecification.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        eventType = RecordQueryREventType.unmarshalEnum(dis);
-        uPosition += eventType.getMarshalledSize();
-        time = dis.readInt();
-        uPosition += 4;
-        numberOfRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfRecords; idx++)
-        {
-            RecordQuerySpecification anX = new RecordQuerySpecification();
-            uPosition += anX.unmarshal(dis);
-            recordIDs.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   eventType.marshal(buff);
-   buff.putInt( (int)time);
-   buff.putInt( (int)recordIDs.size());
-
-   for(int idx = 0; idx < recordIDs.size(); idx++)
-   {
-        RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
-        aRecordQuerySpecification.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    eventType = RecordQueryREventType.unmarshalEnum(buff);
-    time = buff.getInt();
-    numberOfRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfRecords; idx++)
-    {
-    RecordQuerySpecification anX = new RecordQuerySpecification();
-    anX.unmarshal(buff);
-    recordIDs.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RecordQueryRPdu rhs = (RecordQueryRPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (eventType == rhs.eventType)) ivarsEqual = false;
-     if( ! (time == rhs.time)) ivarsEqual = false;
-
-     for(int idx = 0; idx < recordIDs.size(); idx++)
-        if( ! ( recordIDs.get(idx).equals(rhs.recordIDs.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" eventType: ").append(eventType).append("\n");
-    sb.append(" time: ").append(time).append("\n");
-    sb.append(" recordIDs: ").append("\n");
-    recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
deleted file mode 100644
index f5fb5a6bcef0bad49619f5f3984991e22b0a7243..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a RecordQueryRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordQueryReliablePdu extends RecordQueryRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
deleted file mode 100644
index 94e9d1f17933749a4a456e39dcbe2746b26ea658..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The identification of the records being queried 6.2.72
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordQuerySpecification extends Object implements Serializable
-{
-   protected int  numberOfRecords;
-
-   /** variable length list of 32 bit record types uid = 66 */
-   protected List< VariableRecordType > recordIDs = new ArrayList< VariableRecordType >();
- 
-
-/** Constructor */
- public RecordQuerySpecification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // numberOfRecords
-   for(int idx=0; idx < recordIDs.size(); idx++)
-   {
-        VariableRecordType listElement = recordIDs.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RecordQuerySpecification#recordIDs}*/
-public RecordQuerySpecification setRecordIDs(List<VariableRecordType> pRecordIDs)
-{
-    recordIDs = pRecordIDs;
-    return this;
-}
-
-/** Getter for {@link RecordQuerySpecification#recordIDs}*/
-public List<VariableRecordType> getRecordIDs()
-{
-    return recordIDs; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordIDs.size());
-
-       for(int idx = 0; idx < recordIDs.size(); idx++)
-       {
-            VariableRecordType aVariableRecordType = recordIDs.get(idx);
-            aVariableRecordType.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfRecords; idx++)
-        {
-            VariableRecordType anX = VariableRecordType.unmarshalEnum(dis);
-            recordIDs.add(anX);
-            uPosition += anX.getMarshalledSize();
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordIDs.size());
-
-   for(int idx = 0; idx < recordIDs.size(); idx++)
-   {
-        VariableRecordType aVariableRecordType = recordIDs.get(idx);
-        aVariableRecordType.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfRecords; idx++)
-    {
-    VariableRecordType anX = VariableRecordType.unmarshalEnum(buff);
-    recordIDs.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RecordQuerySpecification rhs = (RecordQuerySpecification)obj;
-
-
-     for(int idx = 0; idx < recordIDs.size(); idx++)
-        if( ! ( recordIDs.get(idx).equals(rhs.recordIDs.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordIDs: ").append("\n");
-    recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordRPdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
deleted file mode 100644
index 3815dae89942bc95009c8b55e91183ace40b5932..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordRPdu.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.16 Used to respond to a Record Query-R PDU or a Set Record-R PDU. It is used to provide information requested in a Record Query-R PDU, to confirm the information received in a Set Record-R PDU, and to confirm the receipt of a periodic or unsolicited Record-R PDU when the acknowledged service level is used.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** request ID */
-   protected int  requestID;
-
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   protected byte  pad1;
-
-   /**  uid 333 */
-   protected RecordREventType eventType = RecordREventType.values()[0];
-
-   /** Number of record sets in list */
-   protected int  numberOfRecordSets;
-
-   /** record sets */
-   protected List< RecordSpecification > recordSets = new ArrayList< RecordSpecification >();
- 
-
-/** Constructor */
- public RecordRPdu()
- {
-    setPduType( DISPDUType.RECORD_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += eventType.getMarshalledSize();
-   marshalSize += 4;  // numberOfRecordSets
-   for(int idx=0; idx < recordSets.size(); idx++)
-   {
-        RecordSpecification listElement = recordSets.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RecordRPdu#requestID}*/
-public RecordRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link RecordRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link RecordRPdu#requiredReliabilityService}*/
-public RecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link RecordRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link RecordRPdu#pad1}*/
-public RecordRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link RecordRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link RecordRPdu#eventType}*/
-public RecordRPdu setEventType(RecordREventType pEventType)
-{
-    eventType = pEventType;
-    return this;
-}
-
-/** Getter for {@link RecordRPdu#eventType}*/
-public RecordREventType getEventType()
-{
-    return eventType; 
-}
-
-/** Setter for {@link RecordRPdu#recordSets}*/
-public RecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
-{
-    recordSets = pRecordSets;
-    return this;
-}
-
-/** Getter for {@link RecordRPdu#recordSets}*/
-public List<RecordSpecification> getRecordSets()
-{
-    return recordSets; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       eventType.marshal(dos);
-       dos.writeInt(recordSets.size());
-
-       for(int idx = 0; idx < recordSets.size(); idx++)
-       {
-            RecordSpecification aRecordSpecification = recordSets.get(idx);
-            aRecordSpecification.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        eventType = RecordREventType.unmarshalEnum(dis);
-        uPosition += eventType.getMarshalledSize();
-        numberOfRecordSets = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfRecordSets; idx++)
-        {
-            RecordSpecification anX = new RecordSpecification();
-            uPosition += anX.unmarshal(dis);
-            recordSets.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   eventType.marshal(buff);
-   buff.putInt( (int)recordSets.size());
-
-   for(int idx = 0; idx < recordSets.size(); idx++)
-   {
-        RecordSpecification aRecordSpecification = recordSets.get(idx);
-        aRecordSpecification.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    eventType = RecordREventType.unmarshalEnum(buff);
-    numberOfRecordSets = buff.getInt();
-    for(int idx = 0; idx < numberOfRecordSets; idx++)
-    {
-    RecordSpecification anX = new RecordSpecification();
-    anX.unmarshal(buff);
-    recordSets.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RecordRPdu rhs = (RecordRPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (eventType == rhs.eventType)) ivarsEqual = false;
-
-     for(int idx = 0; idx < recordSets.size(); idx++)
-        if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" eventType: ").append(eventType).append("\n");
-    sb.append(" recordSets: ").append("\n");
-    recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
deleted file mode 100644
index dea1d2b5314809d99e3ea1b52c70ebf7904ff715..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a RecordRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordReliablePdu extends RecordRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecification.java b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
deleted file mode 100644
index 4bcde00710f1040eacb8d6ae344e9aeb986b1de0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordSpecification.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.73.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordSpecification extends Object implements Serializable
-{
-   /** The number of record sets */
-   protected int  numberOfRecordSets;
-
-   /** variable length list record specifications. */
-   protected List< RecordSpecificationElement > recordSets = new ArrayList< RecordSpecificationElement >();
- 
-
-/** Constructor */
- public RecordSpecification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // numberOfRecordSets
-   for(int idx=0; idx < recordSets.size(); idx++)
-   {
-        RecordSpecificationElement listElement = recordSets.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RecordSpecification#recordSets}*/
-public RecordSpecification setRecordSets(List<RecordSpecificationElement> pRecordSets)
-{
-    recordSets = pRecordSets;
-    return this;
-}
-
-/** Getter for {@link RecordSpecification#recordSets}*/
-public List<RecordSpecificationElement> getRecordSets()
-{
-    return recordSets; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(recordSets.size());
-
-       for(int idx = 0; idx < recordSets.size(); idx++)
-       {
-            RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
-            aRecordSpecificationElement.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfRecordSets = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfRecordSets; idx++)
-        {
-            RecordSpecificationElement anX = new RecordSpecificationElement();
-            uPosition += anX.unmarshal(dis);
-            recordSets.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)recordSets.size());
-
-   for(int idx = 0; idx < recordSets.size(); idx++)
-   {
-        RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
-        aRecordSpecificationElement.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfRecordSets = buff.getInt();
-    for(int idx = 0; idx < numberOfRecordSets; idx++)
-    {
-    RecordSpecificationElement anX = new RecordSpecificationElement();
-    anX.unmarshal(buff);
-    recordSets.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RecordSpecification rhs = (RecordSpecification)obj;
-
-
-     for(int idx = 0; idx < recordSets.size(); idx++)
-        if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordSets: ").append("\n");
-    recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
deleted file mode 100644
index a86962e2ebe2aab0ace45805b65babee8717ed8f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Synthetic record, made up from section 6.2.73. This is used to achieve a repeating variable list element.<p>recordLength, recordCount and recordValues must be set by hand so the.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RecordSpecificationElement extends Object implements Serializable
-{
-   /** the data structure used to convey the parameter values of the record for each record. 32 bit enumeration. uid = 66 */
-   protected VariableRecordType recordID = VariableRecordType.values()[0];
-
-   /** the serial number of the first record in the block of records */
-   protected int  recordSetSerialNumber;
-
-   protected int  padding;
-
-   /**  the length, in bits, of the record. Note, bits, not bytes. */
-   protected short  recordLength;
-
-   /**  the number of records included in the record set  */
-   protected short  recordCount;
-
-   /** the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. */
-   protected byte[]  recordValues = new byte[0]; 
-
-   /** used if required to make entire record size an even multiple of 8 bytes */
-   protected byte[]  padTo64 = new byte[0]; 
-
-
-/** Constructor */
- public RecordSpecificationElement()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordID.getMarshalledSize();
-   marshalSize += 4;  // recordSetSerialNumber
-   marshalSize += 4;  // padding
-   marshalSize += 2;  // recordLength
-   marshalSize += 2;  // recordCount
-   marshalSize += recordValues.length * 1;
-   marshalSize += padTo64.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RecordSpecificationElement#recordID}*/
-public RecordSpecificationElement setRecordID(VariableRecordType pRecordID)
-{
-    recordID = pRecordID;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordID}*/
-public VariableRecordType getRecordID()
-{
-    return recordID; 
-}
-
-/** Setter for {@link RecordSpecificationElement#recordSetSerialNumber}*/
-public RecordSpecificationElement setRecordSetSerialNumber(int pRecordSetSerialNumber)
-{
-    recordSetSerialNumber = pRecordSetSerialNumber;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordSetSerialNumber}*/
-public int getRecordSetSerialNumber()
-{
-    return recordSetSerialNumber; 
-}
-
-/** Setter for {@link RecordSpecificationElement#padding}*/
-public RecordSpecificationElement setPadding(int pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#padding}*/
-public int getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link RecordSpecificationElement#recordLength}*/
-public RecordSpecificationElement setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link RecordSpecificationElement#recordCount}*/
-public RecordSpecificationElement setRecordCount(short pRecordCount)
-{
-    recordCount = pRecordCount;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordCount}*/
-public short getRecordCount()
-{
-    return recordCount; 
-}
-
-/** Setter for {@link RecordSpecificationElement#recordValues}*/
-public RecordSpecificationElement setRecordValues(byte[] pRecordValues)
-{
-    recordValues = pRecordValues;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordValues}*/
-public byte[] getRecordValues()
-{
-    return recordValues; 
-}
-
-/** Setter for {@link RecordSpecificationElement#padTo64}*/
-public RecordSpecificationElement setPadTo64(byte[] pPadTo64)
-{
-    padTo64 = pPadTo64;
-    return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#padTo64}*/
-public byte[] getPadTo64()
-{
-    return padTo64; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordID.marshal(dos);
-       dos.writeInt(recordSetSerialNumber);
-       dos.writeInt(padding);
-       dos.writeShort(recordLength);
-       dos.writeShort(recordCount);
-
-       for(int idx = 0; idx < recordValues.length; idx++)
-           dos.writeByte(recordValues[idx]);
-
-
-       for(int idx = 0; idx < padTo64.length; idx++)
-           dos.writeByte(padTo64[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordID = VariableRecordType.unmarshalEnum(dis);
-        uPosition += recordID.getMarshalledSize();
-        recordSetSerialNumber = dis.readInt();
-        uPosition += 4;
-        padding = dis.readInt();
-        uPosition += 4;
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        recordCount = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < recordValues.length; idx++)
-            recordValues[idx] = dis.readByte();
-        uPosition += (recordValues.length * 1);
-        for(int idx = 0; idx < padTo64.length; idx++)
-            padTo64[idx] = dis.readByte();
-        uPosition += (padTo64.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordID.marshal(buff);
-   buff.putInt( (int)recordSetSerialNumber);
-   buff.putInt( (int)padding);
-   buff.putShort( (short)recordLength);
-   buff.putShort( (short)recordCount);
-
-   for(int idx = 0; idx < recordValues.length; idx++)
-       buff.put((byte)recordValues[idx]);
-
-
-   for(int idx = 0; idx < padTo64.length; idx++)
-       buff.put((byte)padTo64[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordID = VariableRecordType.unmarshalEnum(buff);
-    recordSetSerialNumber = buff.getInt();
-    padding = buff.getInt();
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    recordCount = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < recordValues.length; idx++)
-        recordValues[idx] = buff.get();
-    for(int idx = 0; idx < padTo64.length; idx++)
-        padTo64[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RecordSpecificationElement rhs = (RecordSpecificationElement)obj;
-
-     if( ! (recordID == rhs.recordID)) ivarsEqual = false;
-     if( ! (recordSetSerialNumber == rhs.recordSetSerialNumber)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-     if( ! (recordCount == rhs.recordCount)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordValues[idx] == rhs.recordValues[idx])) ivarsEqual = false;
-     }
-
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(padTo64[idx] == rhs.padTo64[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordID: ").append(recordID).append("\n");
-    sb.append(" recordSetSerialNumber: ").append(recordSetSerialNumber).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" recordCount: ").append(recordCount).append("\n");
-    sb.append(" recordValues: ").append("\n");
-    sb.append(Arrays.toString(recordValues)).append("\n");
-    sb.append(" padTo64: ").append("\n");
-    sb.append(Arrays.toString(padTo64)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Relationship.java b/src-generated/edu/nps/moves/dis7/Relationship.java
deleted file mode 100644
index 9d2990b9aa73e6630e7d8b331c576cee5fca3df2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Relationship.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The relationship of the part entity to its host entity. Section 6.2.74.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Relationship extends Object implements Serializable
-{
-   /** the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration uid 210 */
-   protected IsPartOfNature nature = IsPartOfNature.values()[0];
-
-   /** the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration uid 211 */
-   protected IsPartOfPosition position = IsPartOfPosition.values()[0];
-
-
-/** Constructor */
- public Relationship()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += nature.getMarshalledSize();
-   marshalSize += position.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Relationship#nature}*/
-public Relationship setNature(IsPartOfNature pNature)
-{
-    nature = pNature;
-    return this;
-}
-
-/** Getter for {@link Relationship#nature}*/
-public IsPartOfNature getNature()
-{
-    return nature; 
-}
-
-/** Setter for {@link Relationship#position}*/
-public Relationship setPosition(IsPartOfPosition pPosition)
-{
-    position = pPosition;
-    return this;
-}
-
-/** Getter for {@link Relationship#position}*/
-public IsPartOfPosition getPosition()
-{
-    return position; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       nature.marshal(dos);
-       position.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        nature = IsPartOfNature.unmarshalEnum(dis);
-        uPosition += nature.getMarshalledSize();
-        position = IsPartOfPosition.unmarshalEnum(dis);
-        uPosition += position.getMarshalledSize();
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   nature.marshal(buff);
-   position.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    nature = IsPartOfNature.unmarshalEnum(buff);
-    position = IsPartOfPosition.unmarshalEnum(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Relationship rhs = (Relationship)obj;
-
-     if( ! (nature == rhs.nature)) ivarsEqual = false;
-     if( ! (position == rhs.position)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" nature: ").append(nature).append("\n");
-    sb.append(" position: ").append(position).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
deleted file mode 100644
index e24a22bcb295957f099538795ac9143f21758e4a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. See 5.6.5.3.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RemoveEntityPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** This field shall identify the specific and unique start/resume request being made by the SM */
-   protected int  requestID;
-
-
-/** Constructor */
- public RemoveEntityPdu()
- {
-    setPduType( DISPDUType.REMOVE_ENTITY );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RemoveEntityPdu#requestID}*/
-public RemoveEntityPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link RemoveEntityPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RemoveEntityPdu rhs = (RemoveEntityPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
deleted file mode 100644
index 111fb9174bf8227e65c72c979782c379150f180b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.3 Contains the same information as found in the Remove Entity PDU with the addition of the level of reliability service to be used for the removal action being requested.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RemoveEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   protected byte  pad1;
-
-   protected short  pad2;
-
-   /** Request ID */
-   protected int  requestID;
-
-
-/** Constructor */
- public RemoveEntityRPdu()
- {
-    setPduType( DISPDUType.REMOVE_ENTITY_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RemoveEntityRPdu#requiredReliabilityService}*/
-public RemoveEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link RemoveEntityRPdu#pad1}*/
-public RemoveEntityRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link RemoveEntityRPdu#pad2}*/
-public RemoveEntityRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link RemoveEntityRPdu#requestID}*/
-public RemoveEntityRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RemoveEntityRPdu rhs = (RemoveEntityRPdu)obj;
-
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
deleted file mode 100644
index 0646de8a04fac5c6a3c15fd230d4689408b10d42..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a RemoveEntityRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RemoveEntityReliablePdu extends RemoveEntityRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
deleted file mode 100644
index f92c6e9501cb78be6271584c715e16e1f13e967d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.10 Used by the repairing entity to communicate the repair that has been performed for the entity that requested repair service.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RepairCompletePdu extends LogisticsFamilyPdu implements Serializable
-{
-   /** Entity that is receiving service.  See 6.2.28 */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** Entity that is supplying.  See 6.2.28 */
-   protected EntityID  repairingEntityID = new EntityID(); 
-
-   /** Enumeration for type of repair.  See 6.2.74 uid 64 */
-   protected RepairCompleteRepair repair = RepairCompleteRepair.values()[0];
-
-   /** padding, number prevents conflict with superclass ivar name */
-   protected short  padding4 = (short)0;
-
-
-/** Constructor */
- public RepairCompletePdu()
- {
-    setPduType( DISPDUType.REPAIR_COMPLETE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += repairingEntityID.getMarshalledSize();
-   marshalSize += repair.getMarshalledSize();
-   marshalSize += 2;  // padding4
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RepairCompletePdu#receivingEntityID}*/
-public RepairCompletePdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link RepairCompletePdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link RepairCompletePdu#repairingEntityID}*/
-public RepairCompletePdu setRepairingEntityID(EntityID pRepairingEntityID)
-{
-    repairingEntityID = pRepairingEntityID;
-    return this;
-}
-
-/** Getter for {@link RepairCompletePdu#repairingEntityID}*/
-public EntityID getRepairingEntityID()
-{
-    return repairingEntityID; 
-}
-
-/** Setter for {@link RepairCompletePdu#repair}*/
-public RepairCompletePdu setRepair(RepairCompleteRepair pRepair)
-{
-    repair = pRepair;
-    return this;
-}
-
-/** Getter for {@link RepairCompletePdu#repair}*/
-public RepairCompleteRepair getRepair()
-{
-    return repair; 
-}
-
-/** Setter for {@link RepairCompletePdu#padding4}*/
-public RepairCompletePdu setPadding4(short pPadding4)
-{
-    padding4 = pPadding4;
-    return this;
-}
-
-/** Getter for {@link RepairCompletePdu#padding4}*/
-public short getPadding4()
-{
-    return padding4; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       receivingEntityID.marshal(dos);
-       repairingEntityID.marshal(dos);
-       repair.marshal(dos);
-       dos.writeShort(padding4);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += receivingEntityID.unmarshal(dis);
-        uPosition += repairingEntityID.unmarshal(dis);
-        repair = RepairCompleteRepair.unmarshalEnum(dis);
-        uPosition += repair.getMarshalledSize();
-        padding4 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   receivingEntityID.marshal(buff);
-   repairingEntityID.marshal(buff);
-   repair.marshal(buff);
-   buff.putShort( (short)padding4);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    receivingEntityID.unmarshal(buff);
-    repairingEntityID.unmarshal(buff);
-    repair = RepairCompleteRepair.unmarshalEnum(buff);
-    padding4 = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RepairCompletePdu rhs = (RepairCompletePdu)obj;
-
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (repairingEntityID.equals( rhs.repairingEntityID) )) ivarsEqual = false;
-     if( ! (repair == rhs.repair)) ivarsEqual = false;
-     if( ! (padding4 == rhs.padding4)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
-    sb.append(" repair: ").append(repair).append("\n");
-    sb.append(" padding4: ").append(padding4).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
deleted file mode 100644
index e4b560ef5a90f7e37213826fcb2f813f53372d60..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.11 used by the receiving entity to acknowledge the receipt of a Repair Complete PDU
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RepairResponsePdu extends LogisticsFamilyPdu implements Serializable
-{
-   /** Entity that requested repairs.  See 6.2.28 */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** Entity that is repairing.  See 6.2.28 */
-   protected EntityID  repairingEntityID = new EntityID(); 
-
-   /** Result of repair operation uid 64 */
-   protected RepairResponseRepairResult repairResult = RepairResponseRepairResult.values()[0];
-
-   /** padding */
-   protected byte  padding1 = (byte)0;
-
-   /** padding */
-   protected short  padding2 = (short)0;
-
-
-/** Constructor */
- public RepairResponsePdu()
- {
-    setPduType( DISPDUType.REPAIR_RESPONSE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += repairingEntityID.getMarshalledSize();
-   marshalSize += repairResult.getMarshalledSize();
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RepairResponsePdu#receivingEntityID}*/
-public RepairResponsePdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link RepairResponsePdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link RepairResponsePdu#repairingEntityID}*/
-public RepairResponsePdu setRepairingEntityID(EntityID pRepairingEntityID)
-{
-    repairingEntityID = pRepairingEntityID;
-    return this;
-}
-
-/** Getter for {@link RepairResponsePdu#repairingEntityID}*/
-public EntityID getRepairingEntityID()
-{
-    return repairingEntityID; 
-}
-
-/** Setter for {@link RepairResponsePdu#repairResult}*/
-public RepairResponsePdu setRepairResult(RepairResponseRepairResult pRepairResult)
-{
-    repairResult = pRepairResult;
-    return this;
-}
-
-/** Getter for {@link RepairResponsePdu#repairResult}*/
-public RepairResponseRepairResult getRepairResult()
-{
-    return repairResult; 
-}
-
-/** Setter for {@link RepairResponsePdu#padding1}*/
-public RepairResponsePdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link RepairResponsePdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link RepairResponsePdu#padding2}*/
-public RepairResponsePdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link RepairResponsePdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       receivingEntityID.marshal(dos);
-       repairingEntityID.marshal(dos);
-       repairResult.marshal(dos);
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += receivingEntityID.unmarshal(dis);
-        uPosition += repairingEntityID.unmarshal(dis);
-        repairResult = RepairResponseRepairResult.unmarshalEnum(dis);
-        uPosition += repairResult.getMarshalledSize();
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   receivingEntityID.marshal(buff);
-   repairingEntityID.marshal(buff);
-   repairResult.marshal(buff);
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    receivingEntityID.unmarshal(buff);
-    repairingEntityID.unmarshal(buff);
-    repairResult = RepairResponseRepairResult.unmarshalEnum(buff);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RepairResponsePdu rhs = (RepairResponsePdu)obj;
-
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (repairingEntityID.equals( rhs.repairingEntityID) )) ivarsEqual = false;
-     if( ! (repairResult == rhs.repairResult)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
-    sb.append(" repairResult: ").append(repairResult).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RequestID.java b/src-generated/edu/nps/moves/dis7/RequestID.java
deleted file mode 100644
index 5a5d9821d9e2287324060276d36331c24f20982e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/RequestID.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A monotonically increasing number inserted into all simulation managment PDUs. This should be a hand-coded thingie, maybe a singleton. Section 6.2.75
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class RequestID extends Object implements Serializable
-{
-   /** monotonically increasing number */
-   protected int  requestID;
-
-
-/** Constructor */
- public RequestID()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link RequestID#requestID}*/
-public RequestID setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link RequestID#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final RequestID rhs = (RequestID)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
deleted file mode 100644
index f013e587f78b58447215d92ea34c2365dceeb6fd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.8 Used to communicate the canceling of a resupply service provided through logistics support.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ResupplyCancelPdu extends LogisticsFamilyPdu implements Serializable
-{
-   /** Requesting entity, Section 7.4.5 */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** Supplying entity, Section 7.4.5 */
-   protected EntityID  supplyingEntityID = new EntityID(); 
-
-
-/** Constructor */
- public ResupplyCancelPdu()
- {
-    setPduType( DISPDUType.RESUPPLY_CANCEL );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += supplyingEntityID.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ResupplyCancelPdu#receivingEntityID}*/
-public ResupplyCancelPdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link ResupplyCancelPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link ResupplyCancelPdu#supplyingEntityID}*/
-public ResupplyCancelPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
-{
-    supplyingEntityID = pSupplyingEntityID;
-    return this;
-}
-
-/** Getter for {@link ResupplyCancelPdu#supplyingEntityID}*/
-public EntityID getSupplyingEntityID()
-{
-    return supplyingEntityID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       receivingEntityID.marshal(dos);
-       supplyingEntityID.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += receivingEntityID.unmarshal(dis);
-        uPosition += supplyingEntityID.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   receivingEntityID.marshal(buff);
-   supplyingEntityID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    receivingEntityID.unmarshal(buff);
-    supplyingEntityID.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ResupplyCancelPdu rhs = (ResupplyCancelPdu)obj;
-
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
deleted file mode 100644
index 9c05c3b2e2e8ba874041c77b2d997b780a123009..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.6 Communicate the offer of supplies by a supplying entity to a receiving entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ResupplyOfferPdu extends LogisticsFamilyPdu implements Serializable
-{
-   /** Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3 */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** Identifies the Entity and respective Entity ID Record that is supplying  (see 6.2.28), Section 7.4.3 */
-   protected EntityID  supplyingEntityID = new EntityID(); 
-
-   /** How many supplies types are being offered, Section 7.4.3 */
-   protected byte  numberOfSupplyTypes;
-
-   /** padding */
-   protected byte  padding1 = (byte)0;
-
-   /** padding */
-   protected short  padding2 = (short)0;
-
-   /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */
-   protected List< SupplyQuantity > supplies = new ArrayList< SupplyQuantity >();
- 
-
-/** Constructor */
- public ResupplyOfferPdu()
- {
-    setPduType( DISPDUType.RESUPPLY_OFFER );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += supplyingEntityID.getMarshalledSize();
-   marshalSize += 1;  // numberOfSupplyTypes
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-   for(int idx=0; idx < supplies.size(); idx++)
-   {
-        SupplyQuantity listElement = supplies.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ResupplyOfferPdu#receivingEntityID}*/
-public ResupplyOfferPdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link ResupplyOfferPdu#supplyingEntityID}*/
-public ResupplyOfferPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
-{
-    supplyingEntityID = pSupplyingEntityID;
-    return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#supplyingEntityID}*/
-public EntityID getSupplyingEntityID()
-{
-    return supplyingEntityID; 
-}
-
-/** Setter for {@link ResupplyOfferPdu#padding1}*/
-public ResupplyOfferPdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link ResupplyOfferPdu#padding2}*/
-public ResupplyOfferPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link ResupplyOfferPdu#supplies}*/
-public ResupplyOfferPdu setSupplies(List<SupplyQuantity> pSupplies)
-{
-    supplies = pSupplies;
-    return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#supplies}*/
-public List<SupplyQuantity> getSupplies()
-{
-    return supplies; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       receivingEntityID.marshal(dos);
-       supplyingEntityID.marshal(dos);
-       dos.writeByte(supplies.size());
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-
-       for(int idx = 0; idx < supplies.size(); idx++)
-       {
-            SupplyQuantity aSupplyQuantity = supplies.get(idx);
-            aSupplyQuantity.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += receivingEntityID.unmarshal(dis);
-        uPosition += supplyingEntityID.unmarshal(dis);
-        numberOfSupplyTypes = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfSupplyTypes; idx++)
-        {
-            SupplyQuantity anX = new SupplyQuantity();
-            uPosition += anX.unmarshal(dis);
-            supplies.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   receivingEntityID.marshal(buff);
-   supplyingEntityID.marshal(buff);
-   buff.put( (byte)supplies.size());
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-
-   for(int idx = 0; idx < supplies.size(); idx++)
-   {
-        SupplyQuantity aSupplyQuantity = supplies.get(idx);
-        aSupplyQuantity.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    receivingEntityID.unmarshal(buff);
-    supplyingEntityID.unmarshal(buff);
-    numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfSupplyTypes; idx++)
-    {
-    SupplyQuantity anX = new SupplyQuantity();
-    anX.unmarshal(buff);
-    supplies.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ResupplyOfferPdu rhs = (ResupplyOfferPdu)obj;
-
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < supplies.size(); idx++)
-        if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" supplies: ").append("\n");
-    supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
deleted file mode 100644
index 4cb81ce383e3bb42e39bd9e73cea54484c11ea88..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.7 Used to acknowledge the receipt of supplies by the receiving entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ResupplyReceivedPdu extends LogisticsFamilyPdu implements Serializable
-{
-   /** Entity that is receiving service.  Shall be represented by Entity Identifier record (see 6.2.28) */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** Entity that is supplying.  Shall be represented by Entity Identifier record (see 6.2.28) */
-   protected EntityID  supplyingEntityID = new EntityID(); 
-
-   /** How many supplies are taken by receiving entity */
-   protected byte  numberOfSupplyTypes;
-
-   /** padding */
-   protected byte  padding1 = (byte)0;
-
-   /** padding */
-   protected short  padding2 = (short)0;
-
-   /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */
-   protected List< SupplyQuantity > supplies = new ArrayList< SupplyQuantity >();
- 
-
-/** Constructor */
- public ResupplyReceivedPdu()
- {
-    setPduType( DISPDUType.RESUPPLY_RECEIVED );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += supplyingEntityID.getMarshalledSize();
-   marshalSize += 1;  // numberOfSupplyTypes
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-   for(int idx=0; idx < supplies.size(); idx++)
-   {
-        SupplyQuantity listElement = supplies.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ResupplyReceivedPdu#receivingEntityID}*/
-public ResupplyReceivedPdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link ResupplyReceivedPdu#supplyingEntityID}*/
-public ResupplyReceivedPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
-{
-    supplyingEntityID = pSupplyingEntityID;
-    return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#supplyingEntityID}*/
-public EntityID getSupplyingEntityID()
-{
-    return supplyingEntityID; 
-}
-
-/** Setter for {@link ResupplyReceivedPdu#padding1}*/
-public ResupplyReceivedPdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link ResupplyReceivedPdu#padding2}*/
-public ResupplyReceivedPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link ResupplyReceivedPdu#supplies}*/
-public ResupplyReceivedPdu setSupplies(List<SupplyQuantity> pSupplies)
-{
-    supplies = pSupplies;
-    return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#supplies}*/
-public List<SupplyQuantity> getSupplies()
-{
-    return supplies; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       receivingEntityID.marshal(dos);
-       supplyingEntityID.marshal(dos);
-       dos.writeByte(supplies.size());
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-
-       for(int idx = 0; idx < supplies.size(); idx++)
-       {
-            SupplyQuantity aSupplyQuantity = supplies.get(idx);
-            aSupplyQuantity.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += receivingEntityID.unmarshal(dis);
-        uPosition += supplyingEntityID.unmarshal(dis);
-        numberOfSupplyTypes = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfSupplyTypes; idx++)
-        {
-            SupplyQuantity anX = new SupplyQuantity();
-            uPosition += anX.unmarshal(dis);
-            supplies.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   receivingEntityID.marshal(buff);
-   supplyingEntityID.marshal(buff);
-   buff.put( (byte)supplies.size());
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-
-   for(int idx = 0; idx < supplies.size(); idx++)
-   {
-        SupplyQuantity aSupplyQuantity = supplies.get(idx);
-        aSupplyQuantity.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    receivingEntityID.unmarshal(buff);
-    supplyingEntityID.unmarshal(buff);
-    numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfSupplyTypes; idx++)
-    {
-    SupplyQuantity anX = new SupplyQuantity();
-    anX.unmarshal(buff);
-    supplies.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ResupplyReceivedPdu rhs = (ResupplyReceivedPdu)obj;
-
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < supplies.size(); idx++)
-        if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" supplies: ").append("\n");
-    supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SEESPdu.java b/src-generated/edu/nps/moves/dis7/SEESPdu.java
deleted file mode 100644
index 80d8e3e2ac97dfaf185dd823510c7ba9fc7f5ee2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SEESPdu.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.6 Certain supplemental information on an entity’s physical state and emissions. See 5.7.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SEESPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
-   /** Originating entity ID */
-   protected EntityID  orginatingEntityID = new EntityID(); 
-
-   /** IR Signature representation index */
-   protected short  infraredSignatureRepresentationIndex;
-
-   /** acoustic Signature representation index */
-   protected short  acousticSignatureRepresentationIndex;
-
-   /** radar cross section representation index */
-   protected short  radarCrossSectionSignatureRepresentationIndex;
-
-   /** how many propulsion systems */
-   protected short  numberOfPropulsionSystems;
-
-   /** how many vectoring nozzle systems */
-   protected short  numberOfVectoringNozzleSystems;
-
-   /** variable length list of propulsion system data */
-   protected List< PropulsionSystemData > propulsionSystemData = new ArrayList< PropulsionSystemData >();
- 
-   /** variable length list of vectoring system data */
-   protected List< VectoringNozzleSystem > vectoringSystemData = new ArrayList< VectoringNozzleSystem >();
- 
-
-/** Constructor */
- public SEESPdu()
- {
-    setPduType( DISPDUType.SUPPLEMENTAL_EMISSION_ENTITY_STATE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += orginatingEntityID.getMarshalledSize();
-   marshalSize += 2;  // infraredSignatureRepresentationIndex
-   marshalSize += 2;  // acousticSignatureRepresentationIndex
-   marshalSize += 2;  // radarCrossSectionSignatureRepresentationIndex
-   marshalSize += 2;  // numberOfPropulsionSystems
-   marshalSize += 2;  // numberOfVectoringNozzleSystems
-   for(int idx=0; idx < propulsionSystemData.size(); idx++)
-   {
-        PropulsionSystemData listElement = propulsionSystemData.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < vectoringSystemData.size(); idx++)
-   {
-        VectoringNozzleSystem listElement = vectoringSystemData.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SEESPdu#orginatingEntityID}*/
-public SEESPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
-{
-    orginatingEntityID = pOrginatingEntityID;
-    return this;
-}
-
-/** Getter for {@link SEESPdu#orginatingEntityID}*/
-public EntityID getOrginatingEntityID()
-{
-    return orginatingEntityID; 
-}
-
-/** Setter for {@link SEESPdu#infraredSignatureRepresentationIndex}*/
-public SEESPdu setInfraredSignatureRepresentationIndex(short pInfraredSignatureRepresentationIndex)
-{
-    infraredSignatureRepresentationIndex = pInfraredSignatureRepresentationIndex;
-    return this;
-}
-
-/** Getter for {@link SEESPdu#infraredSignatureRepresentationIndex}*/
-public short getInfraredSignatureRepresentationIndex()
-{
-    return infraredSignatureRepresentationIndex; 
-}
-
-/** Setter for {@link SEESPdu#acousticSignatureRepresentationIndex}*/
-public SEESPdu setAcousticSignatureRepresentationIndex(short pAcousticSignatureRepresentationIndex)
-{
-    acousticSignatureRepresentationIndex = pAcousticSignatureRepresentationIndex;
-    return this;
-}
-
-/** Getter for {@link SEESPdu#acousticSignatureRepresentationIndex}*/
-public short getAcousticSignatureRepresentationIndex()
-{
-    return acousticSignatureRepresentationIndex; 
-}
-
-/** Setter for {@link SEESPdu#radarCrossSectionSignatureRepresentationIndex}*/
-public SEESPdu setRadarCrossSectionSignatureRepresentationIndex(short pRadarCrossSectionSignatureRepresentationIndex)
-{
-    radarCrossSectionSignatureRepresentationIndex = pRadarCrossSectionSignatureRepresentationIndex;
-    return this;
-}
-
-/** Getter for {@link SEESPdu#radarCrossSectionSignatureRepresentationIndex}*/
-public short getRadarCrossSectionSignatureRepresentationIndex()
-{
-    return radarCrossSectionSignatureRepresentationIndex; 
-}
-
-/** Setter for {@link SEESPdu#propulsionSystemData}*/
-public SEESPdu setPropulsionSystemData(List<PropulsionSystemData> pPropulsionSystemData)
-{
-    propulsionSystemData = pPropulsionSystemData;
-    return this;
-}
-
-/** Getter for {@link SEESPdu#propulsionSystemData}*/
-public List<PropulsionSystemData> getPropulsionSystemData()
-{
-    return propulsionSystemData; 
-}
-
-/** Setter for {@link SEESPdu#vectoringSystemData}*/
-public SEESPdu setVectoringSystemData(List<VectoringNozzleSystem> pVectoringSystemData)
-{
-    vectoringSystemData = pVectoringSystemData;
-    return this;
-}
-
-/** Getter for {@link SEESPdu#vectoringSystemData}*/
-public List<VectoringNozzleSystem> getVectoringSystemData()
-{
-    return vectoringSystemData; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       orginatingEntityID.marshal(dos);
-       dos.writeShort(infraredSignatureRepresentationIndex);
-       dos.writeShort(acousticSignatureRepresentationIndex);
-       dos.writeShort(radarCrossSectionSignatureRepresentationIndex);
-       dos.writeShort(propulsionSystemData.size());
-       dos.writeShort(vectoringSystemData.size());
-
-       for(int idx = 0; idx < propulsionSystemData.size(); idx++)
-       {
-            PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
-            aPropulsionSystemData.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < vectoringSystemData.size(); idx++)
-       {
-            VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
-            aVectoringNozzleSystem.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += orginatingEntityID.unmarshal(dis);
-        infraredSignatureRepresentationIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        acousticSignatureRepresentationIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        radarCrossSectionSignatureRepresentationIndex = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfPropulsionSystems = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfVectoringNozzleSystems = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfPropulsionSystems; idx++)
-        {
-            PropulsionSystemData anX = new PropulsionSystemData();
-            uPosition += anX.unmarshal(dis);
-            propulsionSystemData.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVectoringNozzleSystems; idx++)
-        {
-            VectoringNozzleSystem anX = new VectoringNozzleSystem();
-            uPosition += anX.unmarshal(dis);
-            vectoringSystemData.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   orginatingEntityID.marshal(buff);
-   buff.putShort( (short)infraredSignatureRepresentationIndex);
-   buff.putShort( (short)acousticSignatureRepresentationIndex);
-   buff.putShort( (short)radarCrossSectionSignatureRepresentationIndex);
-   buff.putShort( (short)propulsionSystemData.size());
-   buff.putShort( (short)vectoringSystemData.size());
-
-   for(int idx = 0; idx < propulsionSystemData.size(); idx++)
-   {
-        PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
-        aPropulsionSystemData.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < vectoringSystemData.size(); idx++)
-   {
-        VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
-        aVectoringNozzleSystem.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    orginatingEntityID.unmarshal(buff);
-    infraredSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
-    acousticSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
-    radarCrossSectionSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
-    numberOfPropulsionSystems = (short)(buff.getShort() & 0xFFFF);
-    numberOfVectoringNozzleSystems = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfPropulsionSystems; idx++)
-    {
-    PropulsionSystemData anX = new PropulsionSystemData();
-    anX.unmarshal(buff);
-    propulsionSystemData.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVectoringNozzleSystems; idx++)
-    {
-    VectoringNozzleSystem anX = new VectoringNozzleSystem();
-    anX.unmarshal(buff);
-    vectoringSystemData.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SEESPdu rhs = (SEESPdu)obj;
-
-     if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
-     if( ! (infraredSignatureRepresentationIndex == rhs.infraredSignatureRepresentationIndex)) ivarsEqual = false;
-     if( ! (acousticSignatureRepresentationIndex == rhs.acousticSignatureRepresentationIndex)) ivarsEqual = false;
-     if( ! (radarCrossSectionSignatureRepresentationIndex == rhs.radarCrossSectionSignatureRepresentationIndex)) ivarsEqual = false;
-
-     for(int idx = 0; idx < propulsionSystemData.size(); idx++)
-        if( ! ( propulsionSystemData.get(idx).equals(rhs.propulsionSystemData.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < vectoringSystemData.size(); idx++)
-        if( ! ( vectoringSystemData.get(idx).equals(rhs.vectoringSystemData.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
-    sb.append(" infraredSignatureRepresentationIndex: ").append(infraredSignatureRepresentationIndex).append("\n");
-    sb.append(" acousticSignatureRepresentationIndex: ").append(acousticSignatureRepresentationIndex).append("\n");
-    sb.append(" radarCrossSectionSignatureRepresentationIndex: ").append(radarCrossSectionSignatureRepresentationIndex).append("\n");
-    sb.append(" propulsionSystemData: ").append("\n");
-    propulsionSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" vectoringSystemData: ").append("\n");
-    vectoringSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
deleted file mode 100644
index 88de6891ad52739903b08e9698cf1c9d74c6a61a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SecondaryOperationalData extends Object implements Serializable
-{
-   /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */
-   protected byte  operationalData1;
-
-   /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */
-   protected byte  operationalData2;
-
-   /** the number of IFF Fundamental Parameter Data records that follow */
-   protected short  numberOfIFFFundamentalParameterRecords;
-
-
-/** Constructor */
- public SecondaryOperationalData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // operationalData1
-   marshalSize += 1;  // operationalData2
-   marshalSize += 2;  // numberOfIFFFundamentalParameterRecords
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SecondaryOperationalData#operationalData1}*/
-public SecondaryOperationalData setOperationalData1(byte pOperationalData1)
-{
-    operationalData1 = pOperationalData1;
-    return this;
-}
-
-/** Getter for {@link SecondaryOperationalData#operationalData1}*/
-public byte getOperationalData1()
-{
-    return operationalData1; 
-}
-
-/** Setter for {@link SecondaryOperationalData#operationalData2}*/
-public SecondaryOperationalData setOperationalData2(byte pOperationalData2)
-{
-    operationalData2 = pOperationalData2;
-    return this;
-}
-
-/** Getter for {@link SecondaryOperationalData#operationalData2}*/
-public byte getOperationalData2()
-{
-    return operationalData2; 
-}
-
-/** Setter for {@link SecondaryOperationalData#numberOfIFFFundamentalParameterRecords}*/
-public SecondaryOperationalData setNumberOfIFFFundamentalParameterRecords(short pNumberOfIFFFundamentalParameterRecords)
-{
-    numberOfIFFFundamentalParameterRecords = pNumberOfIFFFundamentalParameterRecords;
-    return this;
-}
-
-/** Getter for {@link SecondaryOperationalData#numberOfIFFFundamentalParameterRecords}*/
-public short getNumberOfIFFFundamentalParameterRecords()
-{
-    return numberOfIFFFundamentalParameterRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(operationalData1);
-       dos.writeByte(operationalData2);
-       dos.writeShort(numberOfIFFFundamentalParameterRecords);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        operationalData1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        operationalData2 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfIFFFundamentalParameterRecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)operationalData1);
-   buff.put( (byte)operationalData2);
-   buff.putShort( (short)numberOfIFFFundamentalParameterRecords);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    operationalData1 = (byte)(buff.get() & 0xFF);
-    operationalData2 = (byte)(buff.get() & 0xFF);
-    numberOfIFFFundamentalParameterRecords = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SecondaryOperationalData rhs = (SecondaryOperationalData)obj;
-
-     if( ! (operationalData1 == rhs.operationalData1)) ivarsEqual = false;
-     if( ! (operationalData2 == rhs.operationalData2)) ivarsEqual = false;
-     if( ! (numberOfIFFFundamentalParameterRecords == rhs.numberOfIFFFundamentalParameterRecords)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" operationalData1: ").append(operationalData1).append("\n");
-    sb.append(" operationalData2: ").append(operationalData2).append("\n");
-    sb.append(" numberOfIFFFundamentalParameterRecords: ").append(numberOfIFFFundamentalParameterRecords).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Sensor.java b/src-generated/edu/nps/moves/dis7/Sensor.java
deleted file mode 100644
index 24ab0757c5bda54b9069e794cf755add70476457..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Sensor.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's sensor information.  Section 6.2.77.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Sensor extends Object implements Serializable
-{
-   /**  the source of the Sensor Type field  uid 414 */
-   protected SensorTypeSource sensorTypeSource = SensorTypeSource.values()[0];
-
-   /** the on/off status of the sensor uid 331 */
-   protected SensorOnOffStatus sensorOnOffStatus = SensorOnOffStatus.values()[0];
-
-   /** for Source 'other':SensorRecordOtherActiveSensors/325,'em':EmitterName/75,'passive':SensorRecordSensorTypePassiveSensors/326,'mine':6.2.57,'ua':UAAcousticSystemName/144,'lasers':DesignatorSystemName/80 */
-   protected short  sensorType;
-
-   /**  the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part */
-   protected int  station;
-
-   /** quantity of the sensor  */
-   protected short  quantity;
-
-   /** padding */
-   protected short  padding = (short)0;
-
-
-/** Constructor */
- public Sensor()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += sensorTypeSource.getMarshalledSize();
-   marshalSize += sensorOnOffStatus.getMarshalledSize();
-   marshalSize += 2;  // sensorType
-   marshalSize += 4;  // station
-   marshalSize += 2;  // quantity
-   marshalSize += 2;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Sensor#sensorTypeSource}*/
-public Sensor setSensorTypeSource(SensorTypeSource pSensorTypeSource)
-{
-    sensorTypeSource = pSensorTypeSource;
-    return this;
-}
-
-/** Getter for {@link Sensor#sensorTypeSource}*/
-public SensorTypeSource getSensorTypeSource()
-{
-    return sensorTypeSource; 
-}
-
-/** Setter for {@link Sensor#sensorOnOffStatus}*/
-public Sensor setSensorOnOffStatus(SensorOnOffStatus pSensorOnOffStatus)
-{
-    sensorOnOffStatus = pSensorOnOffStatus;
-    return this;
-}
-
-/** Getter for {@link Sensor#sensorOnOffStatus}*/
-public SensorOnOffStatus getSensorOnOffStatus()
-{
-    return sensorOnOffStatus; 
-}
-
-/** Setter for {@link Sensor#sensorType}*/
-public Sensor setSensorType(short pSensorType)
-{
-    sensorType = pSensorType;
-    return this;
-}
-
-/** Getter for {@link Sensor#sensorType}*/
-public short getSensorType()
-{
-    return sensorType; 
-}
-
-/** Setter for {@link Sensor#station}*/
-public Sensor setStation(int pStation)
-{
-    station = pStation;
-    return this;
-}
-
-/** Getter for {@link Sensor#station}*/
-public int getStation()
-{
-    return station; 
-}
-
-/** Setter for {@link Sensor#quantity}*/
-public Sensor setQuantity(short pQuantity)
-{
-    quantity = pQuantity;
-    return this;
-}
-
-/** Getter for {@link Sensor#quantity}*/
-public short getQuantity()
-{
-    return quantity; 
-}
-
-/** Setter for {@link Sensor#padding}*/
-public Sensor setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link Sensor#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       sensorTypeSource.marshal(dos);
-       sensorOnOffStatus.marshal(dos);
-       dos.writeShort(sensorType);
-       dos.writeInt(station);
-       dos.writeShort(quantity);
-       dos.writeShort(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        sensorTypeSource = SensorTypeSource.unmarshalEnum(dis);
-        uPosition += sensorTypeSource.getMarshalledSize();
-        sensorOnOffStatus = SensorOnOffStatus.unmarshalEnum(dis);
-        uPosition += sensorOnOffStatus.getMarshalledSize();
-        sensorType = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        station = dis.readInt();
-        uPosition += 4;
-        quantity = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   sensorTypeSource.marshal(buff);
-   sensorOnOffStatus.marshal(buff);
-   buff.putShort( (short)sensorType);
-   buff.putInt( (int)station);
-   buff.putShort( (short)quantity);
-   buff.putShort( (short)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    sensorTypeSource = SensorTypeSource.unmarshalEnum(buff);
-    sensorOnOffStatus = SensorOnOffStatus.unmarshalEnum(buff);
-    sensorType = (short)(buff.getShort() & 0xFFFF);
-    station = buff.getInt();
-    quantity = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Sensor rhs = (Sensor)obj;
-
-     if( ! (sensorTypeSource == rhs.sensorTypeSource)) ivarsEqual = false;
-     if( ! (sensorOnOffStatus == rhs.sensorOnOffStatus)) ivarsEqual = false;
-     if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
-     if( ! (station == rhs.station)) ivarsEqual = false;
-     if( ! (quantity == rhs.quantity)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" sensorTypeSource: ").append(sensorTypeSource).append("\n");
-    sb.append(" sensorOnOffStatus: ").append(sensorOnOffStatus).append("\n");
-    sb.append(" sensorType: ").append(sensorType).append("\n");
-    sb.append(" station: ").append(station).append("\n");
-    sb.append(" quantity: ").append(quantity).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SeparationVP.java b/src-generated/edu/nps/moves/dis7/SeparationVP.java
deleted file mode 100644
index 8041f1412efdecde83c6dcdb34e4531e34781499..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SeparationVP.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Physical separation of an entity from another entity.  Section 6.2.94.6
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SeparationVP extends Object implements Serializable
-{
-   /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
-   protected VariableParameterRecordType recordType = VariableParameterRecordType.SEPARATION;
-
-   /** Reason for separation. EBV uid 282 */
-   protected SeparationVPReasonforSeparation reasonForSeparation = SeparationVPReasonforSeparation.values()[0];
-
-   /** Whether the entity existed prior to separation EBV uid 283 */
-   protected SeparationVPPreEntityIndicator preEntityIndicator = SeparationVPPreEntityIndicator.values()[0];
-
-   /** padding */
-   protected byte  padding1 = (byte)0;
-
-   /** ID of parent */
-   protected EntityID  parentEntityID = new EntityID(); 
-
-   /** padding */
-   protected short  padding2 = (short)0;
-
-   /** Station separated from */
-   protected NamedLocationIdentification  stationLocation = new NamedLocationIdentification(); 
-
-
-/** Constructor */
- public SeparationVP()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += reasonForSeparation.getMarshalledSize();
-   marshalSize += preEntityIndicator.getMarshalledSize();
-   marshalSize += 1;  // padding1
-   marshalSize += parentEntityID.getMarshalledSize();
-   marshalSize += 2;  // padding2
-   marshalSize += stationLocation.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SeparationVP#recordType}*/
-public SeparationVP setRecordType(VariableParameterRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#recordType}*/
-public VariableParameterRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link SeparationVP#reasonForSeparation}*/
-public SeparationVP setReasonForSeparation(SeparationVPReasonforSeparation pReasonForSeparation)
-{
-    reasonForSeparation = pReasonForSeparation;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#reasonForSeparation}*/
-public SeparationVPReasonforSeparation getReasonForSeparation()
-{
-    return reasonForSeparation; 
-}
-
-/** Setter for {@link SeparationVP#preEntityIndicator}*/
-public SeparationVP setPreEntityIndicator(SeparationVPPreEntityIndicator pPreEntityIndicator)
-{
-    preEntityIndicator = pPreEntityIndicator;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#preEntityIndicator}*/
-public SeparationVPPreEntityIndicator getPreEntityIndicator()
-{
-    return preEntityIndicator; 
-}
-
-/** Setter for {@link SeparationVP#padding1}*/
-public SeparationVP setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link SeparationVP#parentEntityID}*/
-public SeparationVP setParentEntityID(EntityID pParentEntityID)
-{
-    parentEntityID = pParentEntityID;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#parentEntityID}*/
-public EntityID getParentEntityID()
-{
-    return parentEntityID; 
-}
-
-/** Setter for {@link SeparationVP#padding2}*/
-public SeparationVP setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link SeparationVP#stationLocation}*/
-public SeparationVP setStationLocation(NamedLocationIdentification pStationLocation)
-{
-    stationLocation = pStationLocation;
-    return this;
-}
-
-/** Getter for {@link SeparationVP#stationLocation}*/
-public NamedLocationIdentification getStationLocation()
-{
-    return stationLocation; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       reasonForSeparation.marshal(dos);
-       preEntityIndicator.marshal(dos);
-       dos.writeByte(padding1);
-       parentEntityID.marshal(dos);
-       dos.writeShort(padding2);
-       stationLocation.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableParameterRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        reasonForSeparation = SeparationVPReasonforSeparation.unmarshalEnum(dis);
-        uPosition += reasonForSeparation.getMarshalledSize();
-        preEntityIndicator = SeparationVPPreEntityIndicator.unmarshalEnum(dis);
-        uPosition += preEntityIndicator.getMarshalledSize();
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += parentEntityID.unmarshal(dis);
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += stationLocation.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   reasonForSeparation.marshal(buff);
-   preEntityIndicator.marshal(buff);
-   buff.put( (byte)padding1);
-   parentEntityID.marshal(buff);
-   buff.putShort( (short)padding2);
-   stationLocation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableParameterRecordType.unmarshalEnum(buff);
-    reasonForSeparation = SeparationVPReasonforSeparation.unmarshalEnum(buff);
-    preEntityIndicator = SeparationVPPreEntityIndicator.unmarshalEnum(buff);
-    padding1 = (byte)(buff.get() & 0xFF);
-    parentEntityID.unmarshal(buff);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    stationLocation.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SeparationVP rhs = (SeparationVP)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (reasonForSeparation == rhs.reasonForSeparation)) ivarsEqual = false;
-     if( ! (preEntityIndicator == rhs.preEntityIndicator)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (parentEntityID.equals( rhs.parentEntityID) )) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-     if( ! (stationLocation.equals( rhs.stationLocation) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" reasonForSeparation: ").append(reasonForSeparation).append("\n");
-    sb.append(" preEntityIndicator: ").append(preEntityIndicator).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" parentEntityID: ").append(parentEntityID).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" stationLocation: ").append(stationLocation).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
deleted file mode 100644
index 26d96ebdca156493bb40fb6ba61256d7960a6e0f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.5 Communicate information associated with one entity requesting a service from another.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ServiceRequestPdu extends LogisticsFamilyPdu implements Serializable
-{
-   /** Entity that is requesting service (see 6.2.28), Section 7.4.2 */
-   protected EntityID  requestingEntityID = new EntityID(); 
-
-   /** Entity that is providing the service (see 6.2.28), Section 7.4.2 */
-   protected EntityID  servicingEntityID = new EntityID(); 
-
-   /** Type of service requested, Section 7.4.2 uid 63 */
-   protected ServiceRequestServiceTypeRequested serviceTypeRequested = ServiceRequestServiceTypeRequested.values()[0];
-
-   /** How many requested, Section 7.4.2 */
-   protected byte  numberOfSupplyTypes;
-
-   protected short  padding1 = (short)0;
-
-   protected List< SupplyQuantity > supplies = new ArrayList< SupplyQuantity >();
- 
-
-/** Constructor */
- public ServiceRequestPdu()
- {
-    setPduType( DISPDUType.SERVICE_REQUEST );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += requestingEntityID.getMarshalledSize();
-   marshalSize += servicingEntityID.getMarshalledSize();
-   marshalSize += serviceTypeRequested.getMarshalledSize();
-   marshalSize += 1;  // numberOfSupplyTypes
-   marshalSize += 2;  // padding1
-   for(int idx=0; idx < supplies.size(); idx++)
-   {
-        SupplyQuantity listElement = supplies.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ServiceRequestPdu#requestingEntityID}*/
-public ServiceRequestPdu setRequestingEntityID(EntityID pRequestingEntityID)
-{
-    requestingEntityID = pRequestingEntityID;
-    return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#requestingEntityID}*/
-public EntityID getRequestingEntityID()
-{
-    return requestingEntityID; 
-}
-
-/** Setter for {@link ServiceRequestPdu#servicingEntityID}*/
-public ServiceRequestPdu setServicingEntityID(EntityID pServicingEntityID)
-{
-    servicingEntityID = pServicingEntityID;
-    return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#servicingEntityID}*/
-public EntityID getServicingEntityID()
-{
-    return servicingEntityID; 
-}
-
-/** Setter for {@link ServiceRequestPdu#serviceTypeRequested}*/
-public ServiceRequestPdu setServiceTypeRequested(ServiceRequestServiceTypeRequested pServiceTypeRequested)
-{
-    serviceTypeRequested = pServiceTypeRequested;
-    return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#serviceTypeRequested}*/
-public ServiceRequestServiceTypeRequested getServiceTypeRequested()
-{
-    return serviceTypeRequested; 
-}
-
-/** Setter for {@link ServiceRequestPdu#padding1}*/
-public ServiceRequestPdu setPadding1(short pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#padding1}*/
-public short getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link ServiceRequestPdu#supplies}*/
-public ServiceRequestPdu setSupplies(List<SupplyQuantity> pSupplies)
-{
-    supplies = pSupplies;
-    return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#supplies}*/
-public List<SupplyQuantity> getSupplies()
-{
-    return supplies; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       requestingEntityID.marshal(dos);
-       servicingEntityID.marshal(dos);
-       serviceTypeRequested.marshal(dos);
-       dos.writeByte(supplies.size());
-       dos.writeShort(padding1);
-
-       for(int idx = 0; idx < supplies.size(); idx++)
-       {
-            SupplyQuantity aSupplyQuantity = supplies.get(idx);
-            aSupplyQuantity.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += requestingEntityID.unmarshal(dis);
-        uPosition += servicingEntityID.unmarshal(dis);
-        serviceTypeRequested = ServiceRequestServiceTypeRequested.unmarshalEnum(dis);
-        uPosition += serviceTypeRequested.getMarshalledSize();
-        numberOfSupplyTypes = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding1 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfSupplyTypes; idx++)
-        {
-            SupplyQuantity anX = new SupplyQuantity();
-            uPosition += anX.unmarshal(dis);
-            supplies.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   requestingEntityID.marshal(buff);
-   servicingEntityID.marshal(buff);
-   serviceTypeRequested.marshal(buff);
-   buff.put( (byte)supplies.size());
-   buff.putShort( (short)padding1);
-
-   for(int idx = 0; idx < supplies.size(); idx++)
-   {
-        SupplyQuantity aSupplyQuantity = supplies.get(idx);
-        aSupplyQuantity.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestingEntityID.unmarshal(buff);
-    servicingEntityID.unmarshal(buff);
-    serviceTypeRequested = ServiceRequestServiceTypeRequested.unmarshalEnum(buff);
-    numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
-    padding1 = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfSupplyTypes; idx++)
-    {
-    SupplyQuantity anX = new SupplyQuantity();
-    anX.unmarshal(buff);
-    supplies.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ServiceRequestPdu rhs = (ServiceRequestPdu)obj;
-
-     if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
-     if( ! (servicingEntityID.equals( rhs.servicingEntityID) )) ivarsEqual = false;
-     if( ! (serviceTypeRequested == rhs.serviceTypeRequested)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
-     for(int idx = 0; idx < supplies.size(); idx++)
-        if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
-    sb.append(" servicingEntityID: ").append(servicingEntityID).append("\n");
-    sb.append(" serviceTypeRequested: ").append(serviceTypeRequested).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" supplies: ").append("\n");
-    supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataPdu.java b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
deleted file mode 100644
index a67bea43c846c66b53bac591527ccbaf4511359c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SetDataPdu.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.10. Initializing or changing internal state information shall be communicated using a Set Data PDU. See 5.6.5.10
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SetDataPdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** ID of request */
-   protected int  requestID;
-
-   /** padding */
-   protected int  padding1 = (int)0;
-
-   /** Number of fixed datum records */
-   protected int  numberOfFixedDatumRecords;
-
-   /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
-   protected int  numberOfVariableDatumRecords;
-
-   /** variable length list of fixed datums */
-   protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
- 
-   /** variable length list of variable length datums */
-   protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public SetDataPdu()
- {
-    setPduType( DISPDUType.SET_DATA );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += 4;  // padding1
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum listElement = variableDatums.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SetDataPdu#requestID}*/
-public SetDataPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link SetDataPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link SetDataPdu#padding1}*/
-public SetDataPdu setPadding1(int pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link SetDataPdu#padding1}*/
-public int getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link SetDataPdu#fixedDatums}*/
-public SetDataPdu setFixedDatums(List<FixedDatum> pFixedDatums)
-{
-    fixedDatums = pFixedDatums;
-    return this;
-}
-
-/** Getter for {@link SetDataPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
-{
-    return fixedDatums; 
-}
-
-/** Setter for {@link SetDataPdu#variableDatums}*/
-public SetDataPdu setVariableDatums(List<VariableDatum> pVariableDatums)
-{
-    variableDatums = pVariableDatums;
-    return this;
-}
-
-/** Getter for {@link SetDataPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
-{
-    return variableDatums; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       dos.writeInt(padding1);
-       dos.writeInt(fixedDatums.size());
-       dos.writeInt(variableDatums.size());
-
-       for(int idx = 0; idx < fixedDatums.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatums.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatums.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatums.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        padding1 = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatums.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatums.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   buff.putInt( (int)padding1);
-   buff.putInt( (int)fixedDatums.size());
-   buff.putInt( (int)variableDatums.size());
-
-   for(int idx = 0; idx < fixedDatums.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatums.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatums.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatums.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    padding1 = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatums.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatums.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SetDataPdu rhs = (SetDataPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatums.size(); idx++)
-        if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatums.size(); idx++)
-        if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" fixedDatums: ").append("\n");
-    fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatums: ").append("\n");
-    variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
deleted file mode 100644
index c05e150902235b569f97d5e1774c48c3d99f7618..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.10 Serves the same function as the Set Data PDU but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SetDataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   /** padding */
-   protected byte  pad1;
-
-   /** padding */
-   protected short  pad2;
-
-   /** request ID */
-   protected int  requestID;
-
-   /** Fixed datum record count */
-   protected int  numberOfFixedDatumRecords;
-
-   /** variable datum record count */
-   protected int  numberOfVariableDatumRecords;
-
-   /** Fixed datum records */
-   protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
- 
-   /** Variable datum records */
-   protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
- 
-
-/** Constructor */
- public SetDataRPdu()
- {
-    setPduType( DISPDUType.SET_DATA_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // requestID
-   marshalSize += 4;  // numberOfFixedDatumRecords
-   marshalSize += 4;  // numberOfVariableDatumRecords
-   for(int idx=0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum listElement = fixedDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum listElement = variableDatumRecords.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SetDataRPdu#requiredReliabilityService}*/
-public SetDataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link SetDataRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link SetDataRPdu#pad1}*/
-public SetDataRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link SetDataRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link SetDataRPdu#pad2}*/
-public SetDataRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link SetDataRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link SetDataRPdu#requestID}*/
-public SetDataRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link SetDataRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link SetDataRPdu#fixedDatumRecords}*/
-public SetDataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
-{
-    fixedDatumRecords = pFixedDatumRecords;
-    return this;
-}
-
-/** Getter for {@link SetDataRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
-{
-    return fixedDatumRecords; 
-}
-
-/** Setter for {@link SetDataRPdu#variableDatumRecords}*/
-public SetDataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
-{
-    variableDatumRecords = pVariableDatumRecords;
-    return this;
-}
-
-/** Getter for {@link SetDataRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
-{
-    return variableDatumRecords; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(requestID);
-       dos.writeInt(fixedDatumRecords.size());
-       dos.writeInt(variableDatumRecords.size());
-
-       for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-       {
-            FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-            aFixedDatum.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-       {
-            VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-            aVariableDatum.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-        numberOfFixedDatumRecords = dis.readInt();
-        uPosition += 4;
-        numberOfVariableDatumRecords = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-        {
-            FixedDatum anX = new FixedDatum();
-            uPosition += anX.unmarshal(dis);
-            fixedDatumRecords.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-        {
-            VariableDatum anX = new VariableDatum();
-            uPosition += anX.unmarshal(dis);
-            variableDatumRecords.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)requestID);
-   buff.putInt( (int)fixedDatumRecords.size());
-   buff.putInt( (int)variableDatumRecords.size());
-
-   for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-   {
-        FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
-        aFixedDatum.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-   {
-        VariableDatum aVariableDatum = variableDatumRecords.get(idx);
-        aVariableDatum.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    numberOfFixedDatumRecords = buff.getInt();
-    numberOfVariableDatumRecords = buff.getInt();
-    for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
-    {
-    FixedDatum anX = new FixedDatum();
-    anX.unmarshal(buff);
-    fixedDatumRecords.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
-    {
-    VariableDatum anX = new VariableDatum();
-    anX.unmarshal(buff);
-    variableDatumRecords.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SetDataRPdu rhs = (SetDataRPdu)obj;
-
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-
-     for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
-        if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < variableDatumRecords.size(); idx++)
-        if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" fixedDatumRecords: ").append("\n");
-    fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" variableDatumRecords: ").append("\n");
-    variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
deleted file mode 100644
index 38ec33c3800d2c2bd87a13fd5029894f6c38036c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a SetDataRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SetDataReliablePdu extends SetDataRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
deleted file mode 100644
index c986977ab04573bce3abf7b85196e489eb8735a0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.15 Used to set or change certain parameter values. These parameter values are contained within a record format as compared to the datum format used in the Set Data-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SetRecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** request ID */
-   protected int  requestID;
-
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   protected byte  pad1;
-
-   protected short  pad2;
-
-   protected int  pad3;
-
-   /** Number of record sets in list */
-   protected int  numberOfRecordSets;
-
-   /** record sets */
-   protected List< RecordSpecification > recordSets = new ArrayList< RecordSpecification >();
- 
-
-/** Constructor */
- public SetRecordRPdu()
- {
-    setPduType( DISPDUType.SET_RECORD_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // pad3
-   marshalSize += 4;  // numberOfRecordSets
-   for(int idx=0; idx < recordSets.size(); idx++)
-   {
-        RecordSpecification listElement = recordSets.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SetRecordRPdu#requestID}*/
-public SetRecordRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link SetRecordRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link SetRecordRPdu#requiredReliabilityService}*/
-public SetRecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link SetRecordRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link SetRecordRPdu#pad1}*/
-public SetRecordRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link SetRecordRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link SetRecordRPdu#pad2}*/
-public SetRecordRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link SetRecordRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link SetRecordRPdu#pad3}*/
-public SetRecordRPdu setPad3(int pPad3)
-{
-    pad3 = pPad3;
-    return this;
-}
-
-/** Getter for {@link SetRecordRPdu#pad3}*/
-public int getPad3()
-{
-    return pad3; 
-}
-
-/** Setter for {@link SetRecordRPdu#recordSets}*/
-public SetRecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
-{
-    recordSets = pRecordSets;
-    return this;
-}
-
-/** Getter for {@link SetRecordRPdu#recordSets}*/
-public List<RecordSpecification> getRecordSets()
-{
-    return recordSets; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       dos.writeInt(requestID);
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(pad3);
-       dos.writeInt(recordSets.size());
-
-       for(int idx = 0; idx < recordSets.size(); idx++)
-       {
-            RecordSpecification aRecordSpecification = recordSets.get(idx);
-            aRecordSpecification.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        requestID = dis.readInt();
-        uPosition += 4;
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        pad3 = dis.readInt();
-        uPosition += 4;
-        numberOfRecordSets = dis.readInt();
-        uPosition += 4;
-        for(int idx = 0; idx < numberOfRecordSets; idx++)
-        {
-            RecordSpecification anX = new RecordSpecification();
-            uPosition += anX.unmarshal(dis);
-            recordSets.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   buff.putInt( (int)requestID);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)pad3);
-   buff.putInt( (int)recordSets.size());
-
-   for(int idx = 0; idx < recordSets.size(); idx++)
-   {
-        RecordSpecification aRecordSpecification = recordSets.get(idx);
-        aRecordSpecification.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    requestID = buff.getInt();
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    pad3 = buff.getInt();
-    numberOfRecordSets = buff.getInt();
-    for(int idx = 0; idx < numberOfRecordSets; idx++)
-    {
-    RecordSpecification anX = new RecordSpecification();
-    anX.unmarshal(buff);
-    recordSets.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SetRecordRPdu rhs = (SetRecordRPdu)obj;
-
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
-
-     for(int idx = 0; idx < recordSets.size(); idx++)
-        if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" pad3: ").append(pad3).append("\n");
-    sb.append(" recordSets: ").append("\n");
-    recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
deleted file mode 100644
index dc2070592711c0b0ee88a0c0d18f4f9801d7ed68..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a SetRecordRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SetRecordReliablePdu extends SetRecordRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/ShaftRPM.java b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
deleted file mode 100644
index 48938df5fe3a576e5c2befbb132e07e8197b211d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/ShaftRPM.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class ShaftRPM extends Object implements Serializable
-{
-   protected short  currentRPM;
-
-   protected short  orderedRPM;
-
-   protected int  RPMrateOfChange;
-
-
-/** Constructor */
- public ShaftRPM()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // currentRPM
-   marshalSize += 2;  // orderedRPM
-   marshalSize += 4;  // RPMrateOfChange
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link ShaftRPM#currentRPM}*/
-public ShaftRPM setCurrentRPM(short pCurrentRPM)
-{
-    currentRPM = pCurrentRPM;
-    return this;
-}
-
-/** Getter for {@link ShaftRPM#currentRPM}*/
-public short getCurrentRPM()
-{
-    return currentRPM; 
-}
-
-/** Setter for {@link ShaftRPM#orderedRPM}*/
-public ShaftRPM setOrderedRPM(short pOrderedRPM)
-{
-    orderedRPM = pOrderedRPM;
-    return this;
-}
-
-/** Getter for {@link ShaftRPM#orderedRPM}*/
-public short getOrderedRPM()
-{
-    return orderedRPM; 
-}
-
-/** Setter for {@link ShaftRPM#RPMrateOfChange}*/
-public ShaftRPM setRPMrateOfChange(int pRPMrateOfChange)
-{
-    RPMrateOfChange = pRPMrateOfChange;
-    return this;
-}
-
-/** Getter for {@link ShaftRPM#RPMrateOfChange}*/
-public int getRPMrateOfChange()
-{
-    return RPMrateOfChange; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(currentRPM);
-       dos.writeShort(orderedRPM);
-       dos.writeInt(RPMrateOfChange);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        currentRPM = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        orderedRPM = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        RPMrateOfChange = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)currentRPM);
-   buff.putShort( (short)orderedRPM);
-   buff.putInt( (int)RPMrateOfChange);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    currentRPM = (short)(buff.getShort() & 0xFFFF);
-    orderedRPM = (short)(buff.getShort() & 0xFFFF);
-    RPMrateOfChange = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final ShaftRPM rhs = (ShaftRPM)obj;
-
-     if( ! (currentRPM == rhs.currentRPM)) ivarsEqual = false;
-     if( ! (orderedRPM == rhs.orderedRPM)) ivarsEqual = false;
-     if( ! (RPMrateOfChange == rhs.RPMrateOfChange)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" currentRPM: ").append(currentRPM).append("\n");
-    sb.append(" orderedRPM: ").append(orderedRPM).append("\n");
-    sb.append(" RPMrateOfChange: ").append(RPMrateOfChange).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SignalPdu.java b/src-generated/edu/nps/moves/dis7/SignalPdu.java
deleted file mode 100644
index 8afa39ebbf7a6363dadcf5d04863dc5d00fcd997..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SignalPdu.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-package edu.nps.moves.dis7;
-
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.4, 7.7.3 Conveys the audio or digital data carried by the simulated radio or intercom transmission.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
-
-  /**
-   *
-   */
-  protected RadioCommsHeader header = new RadioCommsHeader();
-
-  /**
-   * encoding scheme used, and enumeration
-   */
-  protected short encodingScheme;
-
-  /**
-   * tdl type uid 178
-   */
-  protected SignalTDLType tdlType = SignalTDLType.values()[0];
-
-  /**
-   * sample rate
-   */
-  protected int sampleRate;
-
-  /**
-   * length of data in bits
-   */
-  protected Short dataLength;
-
-  /**
-   * number of samples
-   */
-  protected short samples;
-
-  /**
-   * list of eight bit values
-   */
-  protected byte[] data = new byte[1];  // Wireshark complains if no data
-
-  private byte[] padTo32 = new byte[0]; // pad to 32-bit boundary
-
-  /**
-   * Constructor
-   */
-  public SignalPdu()
-  {
-    setPduType(DISPDUType.SIGNAL);
-  }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-  @Override
-  public int getMarshalledSize()
-  {
-    int marshalSize = super.getMarshalledSize();
-    marshalSize += header.getMarshalledSize();
-    marshalSize += 2;  // encodingScheme
-    marshalSize += tdlType.getMarshalledSize();
-    marshalSize += 4;  // sampleRate
-    marshalSize += 2;  // dataLength
-    marshalSize += 2;  // samples
-    marshalSize += data.length;
-    marshalSize += padTo32.length;
-
-    return marshalSize;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#header}
-   * @param pHeader
-   * @return 
-   */
-  public SignalPdu setHeader(RadioCommsHeader pHeader)
-  {
-    header = pHeader;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#header}
-   * @return 
-   */
-  public RadioCommsHeader getHeader()
-  {
-    return header;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#encodingScheme}
-   * @param pEncodingScheme
-   * @return 
-   */
-  public SignalPdu setEncodingScheme(short pEncodingScheme)
-  {
-    encodingScheme = pEncodingScheme;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#encodingScheme}
-   * @return 
-   */
-  public short getEncodingScheme()
-  {
-    return encodingScheme;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#tdlType}
-   *
-   * @param pTdlType
-   * @return this object
-   */
-  public SignalPdu setTdlType(SignalTDLType pTdlType)
-  {
-    tdlType = pTdlType;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#tdlType}
-   * @return 
-   */
-  public SignalTDLType getTdlType()
-  {
-    return tdlType;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#sampleRate}
-   *
-   * @param pSampleRate
-   * @return this object
-   */
-  public SignalPdu setSampleRate(int pSampleRate)
-  {
-    sampleRate = pSampleRate;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#sampleRate}
-   * @return 
-   */
-  public int getSampleRate()
-  {
-    return sampleRate;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#dataLength}
-   * <p>
-   * This value is the size IN BITS of the {@link SignalPdu#dataLength} field. Since that field
-   * is a byte array, its size must be large enough to contain the specified number of bits. If this size is NOT
-   * set and this pdu is issued (marshaled), the value used for this field will be the size of the byte
-   * array times 8.
-   *
-   * @param pDataLength value for field
-   * @return this object
-   */
-  public SignalPdu setDataLength(short pDataLength)
-  {
-    dataLength = pDataLength;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#dataLength}
-   *
-   * @return value of field
-   */
-  public short getDataLength()
-  {
-    return dataLength;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#samples}
-   *
-   * @param pSamples value for field
-   * @return this object
-   */
-  public SignalPdu setSamples(short pSamples)
-  {
-    samples = pSamples;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#samples}
-   *
-   * @return value of field
-   */
-  public short getSamples()
-  {
-    return samples;
-  }
-
-  /**
-   * Setter for {@link SignalPdu#data}
-   * <p>
-   * This is described in the specification as a stream of bits, but is implemented in Java as a byte array.
-   * The size of the byte array reflects the value of {@link SignalPdu#dataLength} rounded to the next
-   * highest byte boundary. If {@link SignalPdu#dataLength} is not set when the Pdu is sent, the
-   * receiver will read a bit length equal to the size of the byte array times 8.
-   *
-   * @return this object
-   * @param pData data
-   */
-  public SignalPdu setData(byte[] pData)
-  {
-    data = pData;
-    return this;
-  }
-
-  /**
-   * Getter for {@link SignalPdu#data}
-   *
-   * @return value of field
-   */
-  public byte[] getData()
-  {
-    return data;
-  }
-
-  /* *************************** */
-  /* Marshal / unmarshal methods */
-  /* *************************** */
-  
-  /**
-   * Serializes an object to a DataOutputStream.
-   *
-   * @see java.io.DataOutputStream
-   * @param dos The DataOutputStream
-   */
-  @Override
-  public void marshal(DataOutputStream dos) throws Exception
-  {
-    super.marshal(dos);
-
-    header.marshal(dos);
-    dos.writeShort(encodingScheme);
-    tdlType.marshal(dos);
-    dos.writeInt(sampleRate);
-
-    if (dataLength != null)
-      dos.writeShort(dataLength);
-    else
-      dos.writeShort((dataLength = calculateDataLength()));
-
-    dos.writeShort(samples);
-    for (int idx = 0; idx < data.length; idx++) {
-      dos.writeByte(data[idx]);
-    }
-    padTo32 = new byte[Align.to32bits(dos)];
-
-  }
-
-  /**
-   * Unserializes an object from a DataInputStream.
-   *
-   * @see java.io.DataInputStream
-   * @param dis The DataInputStream
-   * @return marshaled size
-   */
-  @Override
-  public int unmarshal(DataInputStream dis) throws Exception
-  {
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    uPosition += header.unmarshal(dis);
-    encodingScheme = (short) dis.readUnsignedShort();
-    uPosition += 2;
-    tdlType = SignalTDLType.unmarshalEnum(dis);
-    uPosition += tdlType.getMarshalledSize();
-    sampleRate = dis.readInt();
-    uPosition += 4;
-    dataLength = (short) dis.readUnsignedShort();
-    int byteLength = (dataLength + 7) / 8;
-    data = new byte[byteLength];
-    uPosition += 2;
-    samples = (short) dis.readUnsignedShort();
-    uPosition += 2;
-    
-    for (int idx = 0; idx < byteLength; idx++) {
-      data[idx] = dis.readByte();
-    }
-    uPosition += (data.length * 1);
-    padTo32 = new byte[Align.from32bits(uPosition, dis)];
-    //uPosition += padTo32.length;
-
-    return getMarshalledSize();
-  }
-
-  /**
-   * Packs an object into the ByteBuffer.
-   *
-   * @throws java.nio.BufferOverflowException if buff is too small
-   * @throws java.nio.ReadOnlyBufferException if buff is read only
-   * @see java.nio.ByteBuffer
-   * @param buff The ByteBuffer at the position to begin writing
-   * @throws Exception ByteBuffer-generated exception
-   */
-  @Override
-  public void marshal(java.nio.ByteBuffer buff) throws Exception
-  {
-    super.marshal(buff);
-    header.marshal(buff);
-    buff.putShort(encodingScheme);
-    tdlType.marshal(buff);
-    buff.putInt(sampleRate);
-    
-    if(dataLength != null)
-      buff.putShort(dataLength);
-    else
-      buff.putShort((dataLength = calculateDataLength()));
-    
-    buff.putShort(samples);
-
-    for (int idx = 0; idx < data.length; idx++) {
-      buff.put(data[idx]);
-    }
-    buff.flip(); // will cause BufferOverflowException if we don't flip here
-    padTo32 = new byte[Align.to32bits(buff)];
-  }
-
-  /**
-   * Unpacks a Pdu from the underlying data.
-   *
-   * @throws java.nio.BufferUnderflowException if buff is too small
-   * @see java.nio.ByteBuffer
-   * @param buff The ByteBuffer at the position to begin reading
-   * @return marshalled size
-   * @throws Exception ByteBuffer-generated exception
-   */
-  @Override
-  public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-  {
-    super.unmarshal(buff);
-
-    header.unmarshal(buff);
-    encodingScheme = (short) (buff.getShort() & 0xFFFF);
-    tdlType = SignalTDLType.unmarshalEnum(buff);
-    sampleRate = buff.getInt();
-    dataLength = (short) (buff.getShort() & 0xFFFF);
-    int byteLength = (dataLength+7)/8;
-    data = new byte[byteLength];
-    samples = (short) (buff.getShort() & 0xFFFF);
-    for (int idx = 0; idx < byteLength; idx++) {
-      data[idx] = buff.get();
-    }
-    buff.flip(); // will cause BufferUnderflowException if we don't flip here
-    padTo32 = new byte[Align.from32bits(buff)];
-    return getMarshalledSize();
-  }
-
-  private short calculateDataLength()
-  {
-    return (short) (data.length * 8);
-  }
-
-  /*
-  * The equals method doesn't always work--mostly it works only on classes that consist only of primitives. Be careful.
-   */
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (this == obj)
-      return true;
-
-    if (obj == null)
-      return false;
-
-    if (getClass() != obj.getClass())
-      return false;
-
-    return equalsImpl(obj);
-  }
-
-  @Override
-  public boolean equalsImpl(Object obj)
-  {
-    boolean ivarsEqual = true;
-
-    if (!(obj instanceof SignalPdu))
-      return false;
-
-    final SignalPdu rhs = (SignalPdu) obj;
-
-    if (!(header.equals(rhs.header)))
-      ivarsEqual = false;
-    if (!(encodingScheme == rhs.encodingScheme))
-      ivarsEqual = false;
-    if (!(tdlType == rhs.tdlType))
-      ivarsEqual = false;
-    if (!(sampleRate == rhs.sampleRate))
-      ivarsEqual = false;
-    if (!(dataLength.equals(rhs.dataLength)))
-      ivarsEqual = false;
-    if (!(samples == rhs.samples))
-      ivarsEqual = false;
-
-    for (int idx = 0; idx < 0; idx++) {
-      if (!(data[idx] == rhs.data[idx]))
-        ivarsEqual = false;
-    }
-
-    return ivarsEqual && super.equalsImpl(rhs);
-  }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
deleted file mode 100644
index d5c60c1494f52f7e4ec35df03ae5523f03cf8c88..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * information abou an enitity not producing espdus. Section 6.2.79
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SilentEntitySystem extends Object implements Serializable
-{
-   /** number of the type specified by the entity type field */
-   protected short  numberOfEntities;
-
-   /** number of entity appearance records that follow */
-   protected short  numberOfAppearanceRecords;
-
-   /** Entity type */
-   protected EntityType  entityType = new EntityType(); 
-
-   /** Variable length list of appearance records */
-   protected int[]  appearanceRecordList = new int[0]; 
-
-
-/** Constructor */
- public SilentEntitySystem()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // numberOfEntities
-   marshalSize += 2;  // numberOfAppearanceRecords
-   marshalSize += entityType.getMarshalledSize();
-   marshalSize += appearanceRecordList.length * 4;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SilentEntitySystem#numberOfEntities}*/
-public SilentEntitySystem setNumberOfEntities(short pNumberOfEntities)
-{
-    numberOfEntities = pNumberOfEntities;
-    return this;
-}
-
-/** Getter for {@link SilentEntitySystem#numberOfEntities}*/
-public short getNumberOfEntities()
-{
-    return numberOfEntities; 
-}
-
-/** Setter for {@link SilentEntitySystem#entityType}*/
-public SilentEntitySystem setEntityType(EntityType pEntityType)
-{
-    entityType = pEntityType;
-    return this;
-}
-
-/** Getter for {@link SilentEntitySystem#entityType}*/
-public EntityType getEntityType()
-{
-    return entityType; 
-}
-
-/** Setter for {@link SilentEntitySystem#appearanceRecordList}*/
-public SilentEntitySystem setAppearanceRecordList(int[] pAppearanceRecordList)
-{
-    appearanceRecordList = pAppearanceRecordList;
-    return this;
-}
-
-/** Getter for {@link SilentEntitySystem#appearanceRecordList}*/
-public int[] getAppearanceRecordList()
-{
-    return appearanceRecordList; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(numberOfEntities);
-       dos.writeShort(appearanceRecordList.length);
-       entityType.marshal(dos);
-
-       for(int idx = 0; idx < appearanceRecordList.length; idx++)
-           dos.writeInt(appearanceRecordList[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfEntities = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        numberOfAppearanceRecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += entityType.unmarshal(dis);
-        for(int idx = 0; idx < appearanceRecordList.length; idx++)
-            appearanceRecordList[idx] = dis.readInt();
-        uPosition += (appearanceRecordList.length * 4);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)numberOfEntities);
-   buff.putShort( (short)appearanceRecordList.length);
-   entityType.marshal(buff);
-
-   for(int idx = 0; idx < appearanceRecordList.length; idx++)
-       buff.putInt((int)appearanceRecordList[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfEntities = (short)(buff.getShort() & 0xFFFF);
-    numberOfAppearanceRecords = (short)(buff.getShort() & 0xFFFF);
-    entityType.unmarshal(buff);
-    for(int idx = 0; idx < appearanceRecordList.length; idx++)
-        appearanceRecordList[idx] = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SilentEntitySystem rhs = (SilentEntitySystem)obj;
-
-     if( ! (numberOfEntities == rhs.numberOfEntities)) ivarsEqual = false;
-     if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(appearanceRecordList[idx] == rhs.appearanceRecordList[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" numberOfEntities: ").append(numberOfEntities).append("\n");
-    sb.append(" entityType: ").append(entityType).append("\n");
-    sb.append(" appearanceRecordList: ").append("\n");
-    sb.append(Arrays.toString(appearanceRecordList)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationAddress.java b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
deleted file mode 100644
index de6cc831baf0f1ce056237cfe49f95fea36a1e03..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SimulationAddress.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79 
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SimulationAddress extends Object implements Serializable
-{
-   /** A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event.  */
-   protected short  site;
-
-   /** An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data. */
-   protected short  application;
-
-
-/** Constructor */
- public SimulationAddress()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // site
-   marshalSize += 2;  // application
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SimulationAddress#site}*/
-public SimulationAddress setSite(short pSite)
-{
-    site = pSite;
-    return this;
-}
-
-/** Getter for {@link SimulationAddress#site}*/
-public short getSite()
-{
-    return site; 
-}
-
-/** Setter for {@link SimulationAddress#application}*/
-public SimulationAddress setApplication(short pApplication)
-{
-    application = pApplication;
-    return this;
-}
-
-/** Getter for {@link SimulationAddress#application}*/
-public short getApplication()
-{
-    return application; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(site);
-       dos.writeShort(application);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        site = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        application = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)site);
-   buff.putShort( (short)application);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    site = (short)(buff.getShort() & 0xFFFF);
-    application = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SimulationAddress rhs = (SimulationAddress)obj;
-
-     if( ! (site == rhs.site)) ivarsEqual = false;
-     if( ! (application == rhs.application)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" site: ").append(site).append("\n");
-    sb.append(" application: ").append(application).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
deleted file mode 100644
index 84bc7a0d34153b88fbdb8fe683c49f8925a980db..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SimulationIdentifier extends Object implements Serializable
-{
-   /** Simulation address  */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /** This field shall be set to zero as there is no reference number associated with a Simulation Identifier. */
-   protected short  referenceNumber = (short)0;
-
-
-/** Constructor */
- public SimulationIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // referenceNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SimulationIdentifier#simulationAddress}*/
-public SimulationIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link SimulationIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link SimulationIdentifier#referenceNumber}*/
-public SimulationIdentifier setReferenceNumber(short pReferenceNumber)
-{
-    referenceNumber = pReferenceNumber;
-    return this;
-}
-
-/** Getter for {@link SimulationIdentifier#referenceNumber}*/
-public short getReferenceNumber()
-{
-    return referenceNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(referenceNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        referenceNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)referenceNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    referenceNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SimulationIdentifier rhs = (SimulationIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
deleted file mode 100644
index 2e0f7f2d55fae8b6b4a92579d89a71664eee5d5c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class SimulationManagementFamilyPdu extends PduBase implements Serializable
-{
-   /** IDs the simulation or entity, either a simulation or an entity. Either 6.2.80 or 6.2.28 */
-   protected SimulationIdentifier  originatingID = new SimulationIdentifier(); 
-
-   /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */
-   protected SimulationIdentifier  receivingID = new SimulationIdentifier(); 
-
-
-/** Constructor */
- public SimulationManagementFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.SIMULATION_MANAGEMENT );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += originatingID.getMarshalledSize();
-   marshalSize += receivingID.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SimulationManagementFamilyPdu#originatingID}*/
-public SimulationManagementFamilyPdu setOriginatingID(SimulationIdentifier pOriginatingID)
-{
-    originatingID = pOriginatingID;
-    return this;
-}
-
-/** Getter for {@link SimulationManagementFamilyPdu#originatingID}*/
-public SimulationIdentifier getOriginatingID()
-{
-    return originatingID; 
-}
-
-/** Setter for {@link SimulationManagementFamilyPdu#receivingID}*/
-public SimulationManagementFamilyPdu setReceivingID(SimulationIdentifier pReceivingID)
-{
-    receivingID = pReceivingID;
-    return this;
-}
-
-/** Getter for {@link SimulationManagementFamilyPdu#receivingID}*/
-public SimulationIdentifier getReceivingID()
-{
-    return receivingID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       originatingID.marshal(dos);
-       receivingID.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += originatingID.unmarshal(dis);
-        uPosition += receivingID.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   originatingID.marshal(buff);
-   receivingID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    originatingID.unmarshal(buff);
-    receivingID.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SimulationManagementFamilyPdu rhs = (SimulationManagementFamilyPdu)obj;
-
-     if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
-     if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" originatingID: ").append(originatingID).append("\n");
-    sb.append(" receivingID: ").append(receivingID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
deleted file mode 100644
index 6d03e6cb9ce6f82618e2ff0119573afc88c2cf86..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class SimulationManagementWithReliabilityFamilyPdu extends PduBase implements Serializable
-{
-   /** IDs the simulation or entity, either a simulation or an entity. Either 6.2.80 or 6.2.28 */
-   protected SimulationIdentifier  originatingID = new SimulationIdentifier(); 
-
-   /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */
-   protected SimulationIdentifier  receivingID = new SimulationIdentifier(); 
-
-
-/** Constructor */
- public SimulationManagementWithReliabilityFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.SIMULATION_MANAGEMENT_WITH_RELIABILITY );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += originatingID.getMarshalledSize();
-   marshalSize += receivingID.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SimulationManagementWithReliabilityFamilyPdu#originatingID}*/
-public SimulationManagementWithReliabilityFamilyPdu setOriginatingID(SimulationIdentifier pOriginatingID)
-{
-    originatingID = pOriginatingID;
-    return this;
-}
-
-/** Getter for {@link SimulationManagementWithReliabilityFamilyPdu#originatingID}*/
-public SimulationIdentifier getOriginatingID()
-{
-    return originatingID; 
-}
-
-/** Setter for {@link SimulationManagementWithReliabilityFamilyPdu#receivingID}*/
-public SimulationManagementWithReliabilityFamilyPdu setReceivingID(SimulationIdentifier pReceivingID)
-{
-    receivingID = pReceivingID;
-    return this;
-}
-
-/** Getter for {@link SimulationManagementWithReliabilityFamilyPdu#receivingID}*/
-public SimulationIdentifier getReceivingID()
-{
-    return receivingID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       originatingID.marshal(dos);
-       receivingID.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += originatingID.unmarshal(dis);
-        uPosition += receivingID.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   originatingID.marshal(buff);
-   receivingID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    originatingID.unmarshal(buff);
-    receivingID.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SimulationManagementWithReliabilityFamilyPdu rhs = (SimulationManagementWithReliabilityFamilyPdu)obj;
-
-     if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
-     if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" originatingID: ").append(originatingID).append("\n");
-    sb.append(" receivingID: ").append(receivingID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
deleted file mode 100644
index 31722407cb80bec71b913c3a467b807c0722a7e1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 6.2.83
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StandardVariableRecord extends Object implements Serializable
-{
-   /**  uid 66 */
-   protected VariableRecordType recordType = VariableRecordType.values()[0];
-
-   protected short  recordLength;
-
-   protected byte[]  recordSpecificFields = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public StandardVariableRecord()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 2;  // recordLength
-   marshalSize += recordSpecificFields.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StandardVariableRecord#recordType}*/
-public StandardVariableRecord setRecordType(VariableRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link StandardVariableRecord#recordType}*/
-public VariableRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link StandardVariableRecord#recordSpecificFields}*/
-public StandardVariableRecord setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
-    recordSpecificFields = pRecordSpecificFields;
-    return this;
-}
-
-/** Getter for {@link StandardVariableRecord#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
-{
-    return recordSpecificFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeShort(recordSpecificFields.length);
-
-       for(int idx = 0; idx < recordSpecificFields.length; idx++)
-           dos.writeByte(recordSpecificFields[idx]);
-
-       padding = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < recordSpecificFields.length; idx++)
-            recordSpecificFields[idx] = dis.readByte();
-        uPosition += (recordSpecificFields.length * 1);
-        padding = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   buff.putShort( (short)recordSpecificFields.length);
-
-   for(int idx = 0; idx < recordSpecificFields.length; idx++)
-       buff.put((byte)recordSpecificFields[idx]);
-
-   padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableRecordType.unmarshalEnum(buff);
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < recordSpecificFields.length; idx++)
-        recordSpecificFields[idx] = buff.get();
-    padding = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StandardVariableRecord rhs = (StandardVariableRecord)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordSpecificFields: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
deleted file mode 100644
index b32e0db9cfadead2a127962622dcf23d2b8dffb0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Does not work, and causes failure in anything it is embedded in. Section 6.2.83
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StandardVariableSpecification extends Object implements Serializable
-{
-   /** Number of static variable records */
-   protected short  numberOfStandardVariableRecords;
-
-   /** variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded. */
-   protected List< StandardVariableRecord > standardVariables = new ArrayList< StandardVariableRecord >();
- 
-
-/** Constructor */
- public StandardVariableSpecification()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // numberOfStandardVariableRecords
-   for(int idx=0; idx < standardVariables.size(); idx++)
-   {
-        StandardVariableRecord listElement = standardVariables.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-public short getNumberOfStandardVariableRecords()
-{
-    return (short)standardVariables.size(); 
-}
-
-/* Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
- * The getnumberOfStandardVariableRecords method will also be based on the actual list length rather than this value. 
- * The method is simply here for java bean completeness.
- */
-public StandardVariableSpecification setNumberOfStandardVariableRecords(short pNumberOfStandardVariableRecords)
-{
-    numberOfStandardVariableRecords = pNumberOfStandardVariableRecords;
-    return this;
-}
-
-/** Setter for {@link StandardVariableSpecification#standardVariables}*/
-public StandardVariableSpecification setStandardVariables(List<StandardVariableRecord> pStandardVariables)
-{
-    standardVariables = pStandardVariables;
-    return this;
-}
-
-/** Getter for {@link StandardVariableSpecification#standardVariables}*/
-public List<StandardVariableRecord> getStandardVariables()
-{
-    return standardVariables; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(standardVariables.size());
-
-       for(int idx = 0; idx < standardVariables.size(); idx++)
-       {
-            StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
-            aStandardVariableRecord.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        numberOfStandardVariableRecords = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < numberOfStandardVariableRecords; idx++)
-        {
-            StandardVariableRecord anX = new StandardVariableRecord();
-            uPosition += anX.unmarshal(dis);
-            standardVariables.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)standardVariables.size());
-
-   for(int idx = 0; idx < standardVariables.size(); idx++)
-   {
-        StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
-        aStandardVariableRecord.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    numberOfStandardVariableRecords = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < numberOfStandardVariableRecords; idx++)
-    {
-    StandardVariableRecord anX = new StandardVariableRecord();
-    anX.unmarshal(buff);
-    standardVariables.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StandardVariableSpecification rhs = (StandardVariableSpecification)obj;
-
-     if( ! (numberOfStandardVariableRecords == rhs.numberOfStandardVariableRecords)) ivarsEqual = false;
-
-     for(int idx = 0; idx < standardVariables.size(); idx++)
-        if( ! ( standardVariables.get(idx).equals(rhs.standardVariables.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" numberOfStandardVariableRecords: ").append(numberOfStandardVariableRecords).append("\n");
-    sb.append(" standardVariables: ").append("\n");
-    standardVariables.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumePdu.java b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
deleted file mode 100644
index 1bcc25f83c4eda1c06ac7c9ed09a29941010e7ff..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StartResumePdu.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.4. Start or resume an entity or exercise. See 5.6.5.4.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StartResumePdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16). */
-   protected ClockTime  realWorldTime = new ClockTime(); 
-
-   /** The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16) */
-   protected ClockTime  simulationTime = new ClockTime(); 
-
-   /** Identifier for the specific and unique start/resume request */
-   protected int  requestID;
-
-
-/** Constructor */
- public StartResumePdu()
- {
-    setPduType( DISPDUType.START_RESUME );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += realWorldTime.getMarshalledSize();
-   marshalSize += simulationTime.getMarshalledSize();
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StartResumePdu#realWorldTime}*/
-public StartResumePdu setRealWorldTime(ClockTime pRealWorldTime)
-{
-    realWorldTime = pRealWorldTime;
-    return this;
-}
-
-/** Getter for {@link StartResumePdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
-{
-    return realWorldTime; 
-}
-
-/** Setter for {@link StartResumePdu#simulationTime}*/
-public StartResumePdu setSimulationTime(ClockTime pSimulationTime)
-{
-    simulationTime = pSimulationTime;
-    return this;
-}
-
-/** Getter for {@link StartResumePdu#simulationTime}*/
-public ClockTime getSimulationTime()
-{
-    return simulationTime; 
-}
-
-/** Setter for {@link StartResumePdu#requestID}*/
-public StartResumePdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link StartResumePdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       realWorldTime.marshal(dos);
-       simulationTime.marshal(dos);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += realWorldTime.unmarshal(dis);
-        uPosition += simulationTime.unmarshal(dis);
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   realWorldTime.marshal(buff);
-   simulationTime.marshal(buff);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    realWorldTime.unmarshal(buff);
-    simulationTime.unmarshal(buff);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StartResumePdu rhs = (StartResumePdu)obj;
-
-     if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
-     if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
-    sb.append(" simulationTime: ").append(simulationTime).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
deleted file mode 100644
index 6c28e7293f330bf15a5e6d7fb87753baccdac806..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.4 Serves the same function as the Start/Resume PDU but with the addition of reliability service levels
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StartResumeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** time in real world for this operation to happen */
-   protected ClockTime  realWorldTime = new ClockTime(); 
-
-   /** time in simulation for the simulation to resume */
-   protected ClockTime  simulationTime = new ClockTime(); 
-
-   /** level of reliability service used for this transaction uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   protected byte  pad1;
-
-   protected short  pad2;
-
-   /** Request ID */
-   protected int  requestID;
-
-
-/** Constructor */
- public StartResumeRPdu()
- {
-    setPduType( DISPDUType.START_RESUME_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += realWorldTime.getMarshalledSize();
-   marshalSize += simulationTime.getMarshalledSize();
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 2;  // pad2
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StartResumeRPdu#realWorldTime}*/
-public StartResumeRPdu setRealWorldTime(ClockTime pRealWorldTime)
-{
-    realWorldTime = pRealWorldTime;
-    return this;
-}
-
-/** Getter for {@link StartResumeRPdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
-{
-    return realWorldTime; 
-}
-
-/** Setter for {@link StartResumeRPdu#simulationTime}*/
-public StartResumeRPdu setSimulationTime(ClockTime pSimulationTime)
-{
-    simulationTime = pSimulationTime;
-    return this;
-}
-
-/** Getter for {@link StartResumeRPdu#simulationTime}*/
-public ClockTime getSimulationTime()
-{
-    return simulationTime; 
-}
-
-/** Setter for {@link StartResumeRPdu#requiredReliabilityService}*/
-public StartResumeRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link StartResumeRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link StartResumeRPdu#pad1}*/
-public StartResumeRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link StartResumeRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link StartResumeRPdu#pad2}*/
-public StartResumeRPdu setPad2(short pPad2)
-{
-    pad2 = pPad2;
-    return this;
-}
-
-/** Getter for {@link StartResumeRPdu#pad2}*/
-public short getPad2()
-{
-    return pad2; 
-}
-
-/** Setter for {@link StartResumeRPdu#requestID}*/
-public StartResumeRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link StartResumeRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       realWorldTime.marshal(dos);
-       simulationTime.marshal(dos);
-       requiredReliabilityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeShort(pad2);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += realWorldTime.unmarshal(dis);
-        uPosition += simulationTime.unmarshal(dis);
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        pad2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   realWorldTime.marshal(buff);
-   simulationTime.marshal(buff);
-   requiredReliabilityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putShort( (short)pad2);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    realWorldTime.unmarshal(buff);
-    simulationTime.unmarshal(buff);
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    pad2 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StartResumeRPdu rhs = (StartResumeRPdu)obj;
-
-     if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
-     if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
-    sb.append(" simulationTime: ").append(simulationTime).append("\n");
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" pad2: ").append(pad2).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
deleted file mode 100644
index 2f4b352dde25e0e2160d7542435bc219ab73937e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a StartResumeRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StartResumeReliablePdu extends StartResumeRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
deleted file mode 100644
index be9231ac06a55f7b1ad0be8642d16995e4b45b79..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.5. Stop or freeze an enity or exercise. See 5.6.5.5
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StopFreezePdu extends SimulationManagementFamilyPdu implements Serializable
-{
-   /** real-world(UTC) time at which the entity shall stop or freeze in the exercise */
-   protected ClockTime  realWorldTime = new ClockTime(); 
-
-   /** Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration uid 67 */
-   protected StopFreezeReason reason = StopFreezeReason.values()[0];
-
-   /** Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants uid 68 */
-   protected StopFreezeFrozenBehavior frozenBehavior = new StopFreezeFrozenBehavior();
-
-   /** padding */
-   protected short  padding1 = (short)0;
-
-   /** Request ID that is unique */
-   protected int  requestID;
-
-
-/** Constructor */
- public StopFreezePdu()
- {
-    setPduType( DISPDUType.STOP_FREEZE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += realWorldTime.getMarshalledSize();
-   marshalSize += reason.getMarshalledSize();
-   marshalSize += frozenBehavior.getMarshalledSize();
-   marshalSize += 2;  // padding1
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StopFreezePdu#realWorldTime}*/
-public StopFreezePdu setRealWorldTime(ClockTime pRealWorldTime)
-{
-    realWorldTime = pRealWorldTime;
-    return this;
-}
-
-/** Getter for {@link StopFreezePdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
-{
-    return realWorldTime; 
-}
-
-/** Setter for {@link StopFreezePdu#reason}*/
-public StopFreezePdu setReason(StopFreezeReason pReason)
-{
-    reason = pReason;
-    return this;
-}
-
-/** Getter for {@link StopFreezePdu#reason}*/
-public StopFreezeReason getReason()
-{
-    return reason; 
-}
-
-/** Setter for {@link StopFreezePdu#frozenBehavior}*/
-public StopFreezePdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
-{
-    frozenBehavior = pFrozenBehavior;
-    return this;
-}
-
-/** Setter for {@link StopFreezePdu#frozenBehavior}*/
-public StopFreezeFrozenBehavior getFrozenBehavior()
-{
-    return frozenBehavior; 
-}
-
-/** Setter for {@link StopFreezePdu#padding1}*/
-public StopFreezePdu setPadding1(short pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link StopFreezePdu#padding1}*/
-public short getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link StopFreezePdu#requestID}*/
-public StopFreezePdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link StopFreezePdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       realWorldTime.marshal(dos);
-       reason.marshal(dos);
-       frozenBehavior.marshal(dos);
-       dos.writeShort(padding1);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += realWorldTime.unmarshal(dis);
-        reason = StopFreezeReason.unmarshalEnum(dis);
-        uPosition += reason.getMarshalledSize();
-        uPosition += frozenBehavior.unmarshal(dis);
-        padding1 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   realWorldTime.marshal(buff);
-   reason.marshal(buff);
-   frozenBehavior.marshal(buff);
-   buff.putShort( (short)padding1);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    realWorldTime.unmarshal(buff);
-    reason = StopFreezeReason.unmarshalEnum(buff);
-    frozenBehavior.unmarshal(buff);
-    padding1 = (short)(buff.getShort() & 0xFFFF);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StopFreezePdu rhs = (StopFreezePdu)obj;
-
-     if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
-     if( ! (reason == rhs.reason)) ivarsEqual = false;
-     if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
-    sb.append(" reason: ").append(reason).append("\n");
-    sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
deleted file mode 100644
index 28b309ea0a56b0a2a1a7faec20e621e46f99d354..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.5 Serves the same function as the Stop/Freeze PDU (see 5.6.5.5.1) but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StopFreezeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
-   /** time in real world for this operation to happen */
-   protected ClockTime  realWorldTime = new ClockTime(); 
-
-   /** Reason for stopping/freezing simulation uid 67 */
-   protected StopFreezeReason reason = StopFreezeReason.values()[0];
-
-   /** internal behvior of the simulation while frozen uid 68 */
-   protected StopFreezeFrozenBehavior frozenBehavior = new StopFreezeFrozenBehavior();
-
-   /** reliablity level uid 74 */
-   protected RequiredReliabilityService requiredReliablityService = RequiredReliabilityService.values()[0];
-
-   /** padding */
-   protected byte  pad1;
-
-   /** Request ID */
-   protected int  requestID;
-
-
-/** Constructor */
- public StopFreezeRPdu()
- {
-    setPduType( DISPDUType.STOP_FREEZE_RELIABLE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += realWorldTime.getMarshalledSize();
-   marshalSize += reason.getMarshalledSize();
-   marshalSize += frozenBehavior.getMarshalledSize();
-   marshalSize += requiredReliablityService.getMarshalledSize();
-   marshalSize += 1;  // pad1
-   marshalSize += 4;  // requestID
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StopFreezeRPdu#realWorldTime}*/
-public StopFreezeRPdu setRealWorldTime(ClockTime pRealWorldTime)
-{
-    realWorldTime = pRealWorldTime;
-    return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
-{
-    return realWorldTime; 
-}
-
-/** Setter for {@link StopFreezeRPdu#reason}*/
-public StopFreezeRPdu setReason(StopFreezeReason pReason)
-{
-    reason = pReason;
-    return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#reason}*/
-public StopFreezeReason getReason()
-{
-    return reason; 
-}
-
-/** Setter for {@link StopFreezeRPdu#frozenBehavior}*/
-public StopFreezeRPdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
-{
-    frozenBehavior = pFrozenBehavior;
-    return this;
-}
-
-/** Setter for {@link StopFreezeRPdu#frozenBehavior}*/
-public StopFreezeFrozenBehavior getFrozenBehavior()
-{
-    return frozenBehavior; 
-}
-
-/** Setter for {@link StopFreezeRPdu#requiredReliablityService}*/
-public StopFreezeRPdu setRequiredReliablityService(RequiredReliabilityService pRequiredReliablityService)
-{
-    requiredReliablityService = pRequiredReliablityService;
-    return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#requiredReliablityService}*/
-public RequiredReliabilityService getRequiredReliablityService()
-{
-    return requiredReliablityService; 
-}
-
-/** Setter for {@link StopFreezeRPdu#pad1}*/
-public StopFreezeRPdu setPad1(byte pPad1)
-{
-    pad1 = pPad1;
-    return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#pad1}*/
-public byte getPad1()
-{
-    return pad1; 
-}
-
-/** Setter for {@link StopFreezeRPdu#requestID}*/
-public StopFreezeRPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       realWorldTime.marshal(dos);
-       reason.marshal(dos);
-       frozenBehavior.marshal(dos);
-       requiredReliablityService.marshal(dos);
-       dos.writeByte(pad1);
-       dos.writeInt(requestID);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += realWorldTime.unmarshal(dis);
-        reason = StopFreezeReason.unmarshalEnum(dis);
-        uPosition += reason.getMarshalledSize();
-        uPosition += frozenBehavior.unmarshal(dis);
-        requiredReliablityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliablityService.getMarshalledSize();
-        pad1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        requestID = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   realWorldTime.marshal(buff);
-   reason.marshal(buff);
-   frozenBehavior.marshal(buff);
-   requiredReliablityService.marshal(buff);
-   buff.put( (byte)pad1);
-   buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    realWorldTime.unmarshal(buff);
-    reason = StopFreezeReason.unmarshalEnum(buff);
-    frozenBehavior.unmarshal(buff);
-    requiredReliablityService = RequiredReliabilityService.unmarshalEnum(buff);
-    pad1 = (byte)(buff.get() & 0xFF);
-    requestID = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StopFreezeRPdu rhs = (StopFreezeRPdu)obj;
-
-     if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
-     if( ! (reason == rhs.reason)) ivarsEqual = false;
-     if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
-     if( ! (requiredReliablityService == rhs.requiredReliablityService)) ivarsEqual = false;
-     if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
-    sb.append(" reason: ").append(reason).append("\n");
-    sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
-    sb.append(" requiredReliablityService: ").append(requiredReliablityService).append("\n");
-    sb.append(" pad1: ").append(pad1).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
deleted file mode 100644
index 94c6940256ddb20d7130b93bf8a971f5316490bd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a StopFreezeRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StopFreezeReliablePdu extends StopFreezeRPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuel.java b/src-generated/edu/nps/moves/dis7/StorageFuel.java
deleted file mode 100644
index e2e0da38eaaa5cc298e4758ddb9a4f7eb307ad85..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StorageFuel.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about an entity's engine fuel. Section 6.2.84.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StorageFuel extends Object implements Serializable
-{
-   /** Fuel quantity, units specified by next field */
-   protected int  fuelQuantity;
-
-   /** Units in which the fuel is measured uid 328 */
-   protected FuelMeasurementUnits fuelMeasurementUnits = FuelMeasurementUnits.values()[0];
-
-   /** Type of fuel uid 413 */
-   protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
-   /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
-   protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
-   /** padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public StorageFuel()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // fuelQuantity
-   marshalSize += fuelMeasurementUnits.getMarshalledSize();
-   marshalSize += fuelType.getMarshalledSize();
-   marshalSize += fuelLocation.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StorageFuel#fuelQuantity}*/
-public StorageFuel setFuelQuantity(int pFuelQuantity)
-{
-    fuelQuantity = pFuelQuantity;
-    return this;
-}
-
-/** Getter for {@link StorageFuel#fuelQuantity}*/
-public int getFuelQuantity()
-{
-    return fuelQuantity; 
-}
-
-/** Setter for {@link StorageFuel#fuelMeasurementUnits}*/
-public StorageFuel setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
-{
-    fuelMeasurementUnits = pFuelMeasurementUnits;
-    return this;
-}
-
-/** Getter for {@link StorageFuel#fuelMeasurementUnits}*/
-public FuelMeasurementUnits getFuelMeasurementUnits()
-{
-    return fuelMeasurementUnits; 
-}
-
-/** Setter for {@link StorageFuel#fuelType}*/
-public StorageFuel setFuelType(SupplyFuelType pFuelType)
-{
-    fuelType = pFuelType;
-    return this;
-}
-
-/** Getter for {@link StorageFuel#fuelType}*/
-public SupplyFuelType getFuelType()
-{
-    return fuelType; 
-}
-
-/** Setter for {@link StorageFuel#fuelLocation}*/
-public StorageFuel setFuelLocation(FuelLocation pFuelLocation)
-{
-    fuelLocation = pFuelLocation;
-    return this;
-}
-
-/** Getter for {@link StorageFuel#fuelLocation}*/
-public FuelLocation getFuelLocation()
-{
-    return fuelLocation; 
-}
-
-/** Setter for {@link StorageFuel#padding}*/
-public StorageFuel setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link StorageFuel#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(fuelQuantity);
-       fuelMeasurementUnits.marshal(dos);
-       fuelType.marshal(dos);
-       fuelLocation.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        fuelQuantity = dis.readInt();
-        uPosition += 4;
-        fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
-        uPosition += fuelMeasurementUnits.getMarshalledSize();
-        fuelType = SupplyFuelType.unmarshalEnum(dis);
-        uPosition += fuelType.getMarshalledSize();
-        fuelLocation = FuelLocation.unmarshalEnum(dis);
-        uPosition += fuelLocation.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)fuelQuantity);
-   fuelMeasurementUnits.marshal(buff);
-   fuelType.marshal(buff);
-   fuelLocation.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    fuelQuantity = buff.getInt();
-    fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
-    fuelType = SupplyFuelType.unmarshalEnum(buff);
-    fuelLocation = FuelLocation.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StorageFuel rhs = (StorageFuel)obj;
-
-     if( ! (fuelQuantity == rhs.fuelQuantity)) ivarsEqual = false;
-     if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
-     if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
-     if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
-    sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
-    sb.append(" fuelType: ").append(fuelType).append("\n");
-    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
deleted file mode 100644
index a18b0fd380702a91ef08c8174d0fb5ff7e996ada..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.85.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class StorageFuelReload extends Object implements Serializable
-{
-   /**  the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity. */
-   protected int  standardQuantity;
-
-   /** the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type. */
-   protected int  maximumQuantity;
-
-   /** the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity. */
-   protected int  standardQuantityReloadTime;
-
-   /** the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity. */
-   protected int  maximumQuantityReloadTime;
-
-   /** the fuel measurement units. Enumeration uid 328 */
-   protected FuelMeasurementUnits fuelMeasurementUnits = FuelMeasurementUnits.values()[0];
-
-   /** Fuel type uid 413 */
-   protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
-   /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
-   protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
-   /** padding */
-   protected byte  padding = (byte)0;
-
-
-/** Constructor */
- public StorageFuelReload()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // standardQuantity
-   marshalSize += 4;  // maximumQuantity
-   marshalSize += 4;  // standardQuantityReloadTime
-   marshalSize += 4;  // maximumQuantityReloadTime
-   marshalSize += fuelMeasurementUnits.getMarshalledSize();
-   marshalSize += fuelType.getMarshalledSize();
-   marshalSize += fuelLocation.getMarshalledSize();
-   marshalSize += 1;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link StorageFuelReload#standardQuantity}*/
-public StorageFuelReload setStandardQuantity(int pStandardQuantity)
-{
-    standardQuantity = pStandardQuantity;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#standardQuantity}*/
-public int getStandardQuantity()
-{
-    return standardQuantity; 
-}
-
-/** Setter for {@link StorageFuelReload#maximumQuantity}*/
-public StorageFuelReload setMaximumQuantity(int pMaximumQuantity)
-{
-    maximumQuantity = pMaximumQuantity;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#maximumQuantity}*/
-public int getMaximumQuantity()
-{
-    return maximumQuantity; 
-}
-
-/** Setter for {@link StorageFuelReload#standardQuantityReloadTime}*/
-public StorageFuelReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
-{
-    standardQuantityReloadTime = pStandardQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
-{
-    return standardQuantityReloadTime; 
-}
-
-/** Setter for {@link StorageFuelReload#maximumQuantityReloadTime}*/
-public StorageFuelReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
-{
-    maximumQuantityReloadTime = pMaximumQuantityReloadTime;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
-{
-    return maximumQuantityReloadTime; 
-}
-
-/** Setter for {@link StorageFuelReload#fuelMeasurementUnits}*/
-public StorageFuelReload setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
-{
-    fuelMeasurementUnits = pFuelMeasurementUnits;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#fuelMeasurementUnits}*/
-public FuelMeasurementUnits getFuelMeasurementUnits()
-{
-    return fuelMeasurementUnits; 
-}
-
-/** Setter for {@link StorageFuelReload#fuelType}*/
-public StorageFuelReload setFuelType(SupplyFuelType pFuelType)
-{
-    fuelType = pFuelType;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#fuelType}*/
-public SupplyFuelType getFuelType()
-{
-    return fuelType; 
-}
-
-/** Setter for {@link StorageFuelReload#fuelLocation}*/
-public StorageFuelReload setFuelLocation(FuelLocation pFuelLocation)
-{
-    fuelLocation = pFuelLocation;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#fuelLocation}*/
-public FuelLocation getFuelLocation()
-{
-    return fuelLocation; 
-}
-
-/** Setter for {@link StorageFuelReload#padding}*/
-public StorageFuelReload setPadding(byte pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link StorageFuelReload#padding}*/
-public byte getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(standardQuantity);
-       dos.writeInt(maximumQuantity);
-       dos.writeInt(standardQuantityReloadTime);
-       dos.writeInt(maximumQuantityReloadTime);
-       fuelMeasurementUnits.marshal(dos);
-       fuelType.marshal(dos);
-       fuelLocation.marshal(dos);
-       dos.writeByte(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        standardQuantity = dis.readInt();
-        uPosition += 4;
-        maximumQuantity = dis.readInt();
-        uPosition += 4;
-        standardQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-        maximumQuantityReloadTime = dis.readInt();
-        uPosition += 4;
-        fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
-        uPosition += fuelMeasurementUnits.getMarshalledSize();
-        fuelType = SupplyFuelType.unmarshalEnum(dis);
-        uPosition += fuelType.getMarshalledSize();
-        fuelLocation = FuelLocation.unmarshalEnum(dis);
-        uPosition += fuelLocation.getMarshalledSize();
-        padding = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)standardQuantity);
-   buff.putInt( (int)maximumQuantity);
-   buff.putInt( (int)standardQuantityReloadTime);
-   buff.putInt( (int)maximumQuantityReloadTime);
-   fuelMeasurementUnits.marshal(buff);
-   fuelType.marshal(buff);
-   fuelLocation.marshal(buff);
-   buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    standardQuantity = buff.getInt();
-    maximumQuantity = buff.getInt();
-    standardQuantityReloadTime = buff.getInt();
-    maximumQuantityReloadTime = buff.getInt();
-    fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
-    fuelType = SupplyFuelType.unmarshalEnum(buff);
-    fuelLocation = FuelLocation.unmarshalEnum(buff);
-    padding = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final StorageFuelReload rhs = (StorageFuelReload)obj;
-
-     if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
-     if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
-     if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
-     if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
-     if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
-     if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
-     if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
-    sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
-    sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
-    sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
-    sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
-    sb.append(" fuelType: ").append(fuelType).append("\n");
-    sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SubCategory.java b/src-generated/edu/nps/moves/dis7/SubCategory.java
deleted file mode 100644
index 92532844984c2c99d17820255c34ea552cd01616..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SubCategory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-public interface SubCategory
-{
-    /**
-     * 
-     * @return the value of this SubCategory
-     */
-    int getValue();
-    
-    /**
-     * 
-     * @return the description of this SubCategory
-     */
-    String getDescription();
-}
diff --git a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
deleted file mode 100644
index 181d6fd6f192f1c53fecd93c70bce540d6f87270..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a SEESPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SupplementalEmissionEntityStatePdu extends SEESPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
deleted file mode 100644
index ff71d949134ca1e280ed3f20117541dac26c906e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  A supply, and the amount of that supply. Section 6.2.86
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SupplyQuantity extends Object implements Serializable
-{
-   /** Type of supply */
-   protected EntityType  supplyType = new EntityType(); 
-
-   /** the number of units of a supply type.  */
-   protected float  quantity;
-
-
-/** Constructor */
- public SupplyQuantity()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += supplyType.getMarshalledSize();
-   marshalSize += 4;  // quantity
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SupplyQuantity#supplyType}*/
-public SupplyQuantity setSupplyType(EntityType pSupplyType)
-{
-    supplyType = pSupplyType;
-    return this;
-}
-
-/** Getter for {@link SupplyQuantity#supplyType}*/
-public EntityType getSupplyType()
-{
-    return supplyType; 
-}
-
-/** Setter for {@link SupplyQuantity#quantity}*/
-public SupplyQuantity setQuantity(float pQuantity)
-{
-    quantity = pQuantity;
-    return this;
-}
-
-/** Getter for {@link SupplyQuantity#quantity}*/
-public float getQuantity()
-{
-    return quantity; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       supplyType.marshal(dos);
-       dos.writeFloat(quantity);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += supplyType.unmarshal(dis);
-        quantity = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   supplyType.marshal(buff);
-   buff.putFloat( (float)quantity);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    supplyType.unmarshal(buff);
-    quantity = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SupplyQuantity rhs = (SupplyQuantity)obj;
-
-     if( ! (supplyType.equals( rhs.supplyType) )) ivarsEqual = false;
-     if( ! (quantity == rhs.quantity)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" supplyType: ").append(supplyType).append("\n");
-    sb.append(" quantity: ").append(quantity).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
deleted file mode 100644
index 0f929680763c94458edb66504c9f082b6e89fdf6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.11: Abstract superclass for synthetic environment PDUs
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class SyntheticEnvironmentFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public SyntheticEnvironmentFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.SYNTHETIC_ENVIRONMENT );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SyntheticEnvironmentFamilyPdu rhs = (SyntheticEnvironmentFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
deleted file mode 100644
index 5e82da35b33d82b89646a886682efa34d05254da..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The ID of the IFF emitting system. Section 6.2.87
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class SystemIdentifier extends Object implements Serializable
-{
-   /** general type of emitting system, an enumeration uid 82 */
-   protected IFFSystemType systemType = IFFSystemType.values()[0];
-
-   /** named type of system, an enumeration uid 83 */
-   protected IFFSystemName systemName = IFFSystemName.values()[0];
-
-   /** mode of operation for the system, an enumeration uid 84 */
-   protected IFFSystemMode systemMode = IFFSystemMode.values()[0];
-
-   /** status of this PDU, see section 6.2.15 */
-   protected ChangeOptions  changeOptions = new ChangeOptions(); 
-
-
-/** Constructor */
- public SystemIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += systemType.getMarshalledSize();
-   marshalSize += systemName.getMarshalledSize();
-   marshalSize += systemMode.getMarshalledSize();
-   marshalSize += changeOptions.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link SystemIdentifier#systemType}*/
-public SystemIdentifier setSystemType(IFFSystemType pSystemType)
-{
-    systemType = pSystemType;
-    return this;
-}
-
-/** Getter for {@link SystemIdentifier#systemType}*/
-public IFFSystemType getSystemType()
-{
-    return systemType; 
-}
-
-/** Setter for {@link SystemIdentifier#systemName}*/
-public SystemIdentifier setSystemName(IFFSystemName pSystemName)
-{
-    systemName = pSystemName;
-    return this;
-}
-
-/** Getter for {@link SystemIdentifier#systemName}*/
-public IFFSystemName getSystemName()
-{
-    return systemName; 
-}
-
-/** Setter for {@link SystemIdentifier#systemMode}*/
-public SystemIdentifier setSystemMode(IFFSystemMode pSystemMode)
-{
-    systemMode = pSystemMode;
-    return this;
-}
-
-/** Getter for {@link SystemIdentifier#systemMode}*/
-public IFFSystemMode getSystemMode()
-{
-    return systemMode; 
-}
-
-/** Setter for {@link SystemIdentifier#changeOptions}*/
-public SystemIdentifier setChangeOptions(ChangeOptions pChangeOptions)
-{
-    changeOptions = pChangeOptions;
-    return this;
-}
-
-/** Getter for {@link SystemIdentifier#changeOptions}*/
-public ChangeOptions getChangeOptions()
-{
-    return changeOptions; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       systemType.marshal(dos);
-       systemName.marshal(dos);
-       systemMode.marshal(dos);
-       changeOptions.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        systemType = IFFSystemType.unmarshalEnum(dis);
-        uPosition += systemType.getMarshalledSize();
-        systemName = IFFSystemName.unmarshalEnum(dis);
-        uPosition += systemName.getMarshalledSize();
-        systemMode = IFFSystemMode.unmarshalEnum(dis);
-        uPosition += systemMode.getMarshalledSize();
-        uPosition += changeOptions.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   systemType.marshal(buff);
-   systemName.marshal(buff);
-   systemMode.marshal(buff);
-   changeOptions.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    systemType = IFFSystemType.unmarshalEnum(buff);
-    systemName = IFFSystemName.unmarshalEnum(buff);
-    systemMode = IFFSystemMode.unmarshalEnum(buff);
-    changeOptions.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final SystemIdentifier rhs = (SystemIdentifier)obj;
-
-     if( ! (systemType == rhs.systemType)) ivarsEqual = false;
-     if( ! (systemName == rhs.systemName)) ivarsEqual = false;
-     if( ! (systemMode == rhs.systemMode)) ivarsEqual = false;
-     if( ! (changeOptions.equals( rhs.changeOptions) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" systemType: ").append(systemType).append("\n");
-    sb.append(" systemName: ").append(systemName).append("\n");
-    sb.append(" systemMode: ").append(systemMode).append("\n");
-    sb.append(" changeOptions: ").append(changeOptions).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TSPIPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
deleted file mode 100644
index 76fd04e5d27d66bba7e6c6fa87da60b46d53b825..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/TSPIPdu.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.2 The Time Space Position Information (TSPI) PDU shall communicate information about the LE’s state vector.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class TSPIPdu extends LiveEntityFamilyPdu implements Serializable
-{
-   protected EntityID  liveEntityId = new EntityID(); 
-
-   /** bit field */
-   protected byte  TSPIFlag;
-
-   protected LiveEntityRelativeWorldCoordinates  entityLocation = new LiveEntityRelativeWorldCoordinates(); 
-
-   protected LiveEntityLinearVelocity  entityLinearVelocity = new LiveEntityLinearVelocity(); 
-
-   protected LiveEntityOrientation  entityOrientation = new LiveEntityOrientation(); 
-
-   protected LiveEntityPositionError  positionError = new LiveEntityPositionError(); 
-
-   protected LiveEntityOrientationError  orientationError = new LiveEntityOrientationError(); 
-
-   protected LiveDeadReckoningParameters  deadReckoningParameters = new LiveDeadReckoningParameters(); 
-
-   protected short  measuredSpeed;
-
-   protected byte  systemSpecificDataLength;
-
-   protected byte[]  systemSpecificData = new byte[0]; 
-
-
-/** Constructor */
- public TSPIPdu()
- {
-    setPduType( DISPDUType.TIME_SPACE_POSITION_INFORMATION );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += liveEntityId.getMarshalledSize();
-   marshalSize += 1;  // TSPIFlag
-   marshalSize += entityLocation.getMarshalledSize();
-   marshalSize += entityLinearVelocity.getMarshalledSize();
-   marshalSize += entityOrientation.getMarshalledSize();
-   marshalSize += positionError.getMarshalledSize();
-   marshalSize += orientationError.getMarshalledSize();
-   marshalSize += deadReckoningParameters.getMarshalledSize();
-   marshalSize += 2;  // measuredSpeed
-   marshalSize += 1;  // systemSpecificDataLength
-   marshalSize += systemSpecificData.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link TSPIPdu#liveEntityId}*/
-public TSPIPdu setLiveEntityId(EntityID pLiveEntityId)
-{
-    liveEntityId = pLiveEntityId;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#liveEntityId}*/
-public EntityID getLiveEntityId()
-{
-    return liveEntityId; 
-}
-
-/** Setter for {@link TSPIPdu#TSPIFlag}*/
-public TSPIPdu setTSPIFlag(byte pTSPIFlag)
-{
-    TSPIFlag = pTSPIFlag;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#TSPIFlag}*/
-public byte getTSPIFlag()
-{
-    return TSPIFlag; 
-}
-
-/** Setter for {@link TSPIPdu#entityLocation}*/
-public TSPIPdu setEntityLocation(LiveEntityRelativeWorldCoordinates pEntityLocation)
-{
-    entityLocation = pEntityLocation;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#entityLocation}*/
-public LiveEntityRelativeWorldCoordinates getEntityLocation()
-{
-    return entityLocation; 
-}
-
-/** Setter for {@link TSPIPdu#entityLinearVelocity}*/
-public TSPIPdu setEntityLinearVelocity(LiveEntityLinearVelocity pEntityLinearVelocity)
-{
-    entityLinearVelocity = pEntityLinearVelocity;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#entityLinearVelocity}*/
-public LiveEntityLinearVelocity getEntityLinearVelocity()
-{
-    return entityLinearVelocity; 
-}
-
-/** Setter for {@link TSPIPdu#entityOrientation}*/
-public TSPIPdu setEntityOrientation(LiveEntityOrientation pEntityOrientation)
-{
-    entityOrientation = pEntityOrientation;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#entityOrientation}*/
-public LiveEntityOrientation getEntityOrientation()
-{
-    return entityOrientation; 
-}
-
-/** Setter for {@link TSPIPdu#positionError}*/
-public TSPIPdu setPositionError(LiveEntityPositionError pPositionError)
-{
-    positionError = pPositionError;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#positionError}*/
-public LiveEntityPositionError getPositionError()
-{
-    return positionError; 
-}
-
-/** Setter for {@link TSPIPdu#orientationError}*/
-public TSPIPdu setOrientationError(LiveEntityOrientationError pOrientationError)
-{
-    orientationError = pOrientationError;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#orientationError}*/
-public LiveEntityOrientationError getOrientationError()
-{
-    return orientationError; 
-}
-
-/** Setter for {@link TSPIPdu#deadReckoningParameters}*/
-public TSPIPdu setDeadReckoningParameters(LiveDeadReckoningParameters pDeadReckoningParameters)
-{
-    deadReckoningParameters = pDeadReckoningParameters;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#deadReckoningParameters}*/
-public LiveDeadReckoningParameters getDeadReckoningParameters()
-{
-    return deadReckoningParameters; 
-}
-
-/** Setter for {@link TSPIPdu#measuredSpeed}*/
-public TSPIPdu setMeasuredSpeed(short pMeasuredSpeed)
-{
-    measuredSpeed = pMeasuredSpeed;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#measuredSpeed}*/
-public short getMeasuredSpeed()
-{
-    return measuredSpeed; 
-}
-
-/** Setter for {@link TSPIPdu#systemSpecificData}*/
-public TSPIPdu setSystemSpecificData(byte[] pSystemSpecificData)
-{
-    systemSpecificData = pSystemSpecificData;
-    return this;
-}
-
-/** Getter for {@link TSPIPdu#systemSpecificData}*/
-public byte[] getSystemSpecificData()
-{
-    return systemSpecificData; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       liveEntityId.marshal(dos);
-       dos.writeByte(TSPIFlag);
-       entityLocation.marshal(dos);
-       entityLinearVelocity.marshal(dos);
-       entityOrientation.marshal(dos);
-       positionError.marshal(dos);
-       orientationError.marshal(dos);
-       deadReckoningParameters.marshal(dos);
-       dos.writeShort(measuredSpeed);
-       dos.writeByte(systemSpecificData.length);
-
-       for(int idx = 0; idx < systemSpecificData.length; idx++)
-           dos.writeByte(systemSpecificData[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += liveEntityId.unmarshal(dis);
-        TSPIFlag = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        uPosition += entityLocation.unmarshal(dis);
-        uPosition += entityLinearVelocity.unmarshal(dis);
-        uPosition += entityOrientation.unmarshal(dis);
-        uPosition += positionError.unmarshal(dis);
-        uPosition += orientationError.unmarshal(dis);
-        uPosition += deadReckoningParameters.unmarshal(dis);
-        measuredSpeed = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        systemSpecificDataLength = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        for(int idx = 0; idx < systemSpecificData.length; idx++)
-            systemSpecificData[idx] = dis.readByte();
-        uPosition += (systemSpecificData.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   liveEntityId.marshal(buff);
-   buff.put( (byte)TSPIFlag);
-   entityLocation.marshal(buff);
-   entityLinearVelocity.marshal(buff);
-   entityOrientation.marshal(buff);
-   positionError.marshal(buff);
-   orientationError.marshal(buff);
-   deadReckoningParameters.marshal(buff);
-   buff.putShort( (short)measuredSpeed);
-   buff.put( (byte)systemSpecificData.length);
-
-   for(int idx = 0; idx < systemSpecificData.length; idx++)
-       buff.put((byte)systemSpecificData[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    liveEntityId.unmarshal(buff);
-    TSPIFlag = (byte)(buff.get() & 0xFF);
-    entityLocation.unmarshal(buff);
-    entityLinearVelocity.unmarshal(buff);
-    entityOrientation.unmarshal(buff);
-    positionError.unmarshal(buff);
-    orientationError.unmarshal(buff);
-    deadReckoningParameters.unmarshal(buff);
-    measuredSpeed = (short)(buff.getShort() & 0xFFFF);
-    systemSpecificDataLength = (byte)(buff.get() & 0xFF);
-    for(int idx = 0; idx < systemSpecificData.length; idx++)
-        systemSpecificData[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final TSPIPdu rhs = (TSPIPdu)obj;
-
-     if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
-     if( ! (TSPIFlag == rhs.TSPIFlag)) ivarsEqual = false;
-     if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
-     if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
-     if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
-     if( ! (positionError.equals( rhs.positionError) )) ivarsEqual = false;
-     if( ! (orientationError.equals( rhs.orientationError) )) ivarsEqual = false;
-     if( ! (deadReckoningParameters.equals( rhs.deadReckoningParameters) )) ivarsEqual = false;
-     if( ! (measuredSpeed == rhs.measuredSpeed)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(systemSpecificData[idx] == rhs.systemSpecificData[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
-    sb.append(" TSPIFlag: ").append(TSPIFlag).append("\n");
-    sb.append(" entityLocation: ").append(entityLocation).append("\n");
-    sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
-    sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
-    sb.append(" positionError: ").append(positionError).append("\n");
-    sb.append(" orientationError: ").append(orientationError).append("\n");
-    sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
-    sb.append(" measuredSpeed: ").append(measuredSpeed).append("\n");
-    sb.append(" systemSpecificData: ").append("\n");
-    sb.append(Arrays.toString(systemSpecificData)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
deleted file mode 100644
index 5ae5f2f03157e5cb68f16c0eb97209e8d30b8fed..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a TSPIPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class TimeSpacePositionInformationPdu extends TSPIPdu
-{}
diff --git a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
deleted file mode 100644
index 4ceac7550cd9a4ef57e56e79fe6bf2f95432dfaa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class TotalRecordSets extends Object implements Serializable
-{
-   /** Total number of record sets */
-   protected short  totalRecordSets;
-
-   /** padding */
-   protected short  padding = (short)0;
-
-
-/** Constructor */
- public TotalRecordSets()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 2;  // totalRecordSets
-   marshalSize += 2;  // padding
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link TotalRecordSets#totalRecordSets}*/
-public TotalRecordSets setTotalRecordSets(short pTotalRecordSets)
-{
-    totalRecordSets = pTotalRecordSets;
-    return this;
-}
-
-/** Getter for {@link TotalRecordSets#totalRecordSets}*/
-public short getTotalRecordSets()
-{
-    return totalRecordSets; 
-}
-
-/** Setter for {@link TotalRecordSets#padding}*/
-public TotalRecordSets setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link TotalRecordSets#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeShort(totalRecordSets);
-       dos.writeShort(padding);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        totalRecordSets = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putShort( (short)totalRecordSets);
-   buff.putShort( (short)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    totalRecordSets = (short)(buff.getShort() & 0xFFFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final TotalRecordSets rhs = (TotalRecordSets)obj;
-
-     if( ! (totalRecordSets == rhs.totalRecordSets)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" totalRecordSets: ").append(totalRecordSets).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TrackJamData.java b/src-generated/edu/nps/moves/dis7/TrackJamData.java
deleted file mode 100644
index 46e1364f49ab30b3d01e15c64ebfe010c1cf6af4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/TrackJamData.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  Track-Jam data Section 6.2.89
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class TrackJamData extends Object implements Serializable
-{
-   /** the entity tracked or illumated, or an emitter beam targeted with jamming */
-   protected EntityID  entityID = new EntityID(); 
-
-   /** Emitter system associated with the entity */
-   protected byte  emitterNumber;
-
-   /** Beam associated with the entity */
-   protected byte  beamNumber;
-
-
-/** Constructor */
- public TrackJamData()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += entityID.getMarshalledSize();
-   marshalSize += 1;  // emitterNumber
-   marshalSize += 1;  // beamNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link TrackJamData#entityID}*/
-public TrackJamData setEntityID(EntityID pEntityID)
-{
-    entityID = pEntityID;
-    return this;
-}
-
-/** Getter for {@link TrackJamData#entityID}*/
-public EntityID getEntityID()
-{
-    return entityID; 
-}
-
-/** Setter for {@link TrackJamData#emitterNumber}*/
-public TrackJamData setEmitterNumber(byte pEmitterNumber)
-{
-    emitterNumber = pEmitterNumber;
-    return this;
-}
-
-/** Getter for {@link TrackJamData#emitterNumber}*/
-public byte getEmitterNumber()
-{
-    return emitterNumber; 
-}
-
-/** Setter for {@link TrackJamData#beamNumber}*/
-public TrackJamData setBeamNumber(byte pBeamNumber)
-{
-    beamNumber = pBeamNumber;
-    return this;
-}
-
-/** Getter for {@link TrackJamData#beamNumber}*/
-public byte getBeamNumber()
-{
-    return beamNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       entityID.marshal(dos);
-       dos.writeByte(emitterNumber);
-       dos.writeByte(beamNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += entityID.unmarshal(dis);
-        emitterNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   entityID.marshal(buff);
-   buff.put( (byte)emitterNumber);
-   buff.put( (byte)beamNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    entityID.unmarshal(buff);
-    emitterNumber = (byte)(buff.get() & 0xFF);
-    beamNumber = (byte)(buff.get() & 0xFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final TrackJamData rhs = (TrackJamData)obj;
-
-     if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
-     if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
-     if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" entityID: ").append(entityID).append("\n");
-    sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
-    sb.append(" beamNumber: ").append(beamNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
deleted file mode 100644
index 0745f67dc985c849745da21a66f26648bd70ccd2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- *  Information initiating the dyanic allocation and control of simulation entities between two simulation applications.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class TransferOwnershipPdu extends EntityManagementFamilyPdu implements Serializable
-{
-   /** ID of entity originating request */
-   protected EntityID  originatingEntityID = new EntityID(); 
-
-   /** ID of entity receiving request */
-   protected EntityID  receivingEntityID = new EntityID(); 
-
-   /** ID of request */
-   protected int  requestID;
-
-   /** required level of reliability service. uid 74 */
-   protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
-   /** type of transfer desired uid 224 */
-   protected TransferControlTransferType transferType = TransferControlTransferType.values()[0];
-
-   /** The entity for which control is being requested to transfer */
-   protected EntityID  transferEntityID = new EntityID(); 
-
-   protected RecordSpecification  recordSets = new RecordSpecification(); 
-
-
-/** Constructor */
- public TransferOwnershipPdu()
- {
-    setPduType( DISPDUType.TRANSFER_OWNERSHIP );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += originatingEntityID.getMarshalledSize();
-   marshalSize += receivingEntityID.getMarshalledSize();
-   marshalSize += 4;  // requestID
-   marshalSize += requiredReliabilityService.getMarshalledSize();
-   marshalSize += transferType.getMarshalledSize();
-   marshalSize += transferEntityID.getMarshalledSize();
-   marshalSize += recordSets.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link TransferOwnershipPdu#originatingEntityID}*/
-public TransferOwnershipPdu setOriginatingEntityID(EntityID pOriginatingEntityID)
-{
-    originatingEntityID = pOriginatingEntityID;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#originatingEntityID}*/
-public EntityID getOriginatingEntityID()
-{
-    return originatingEntityID; 
-}
-
-/** Setter for {@link TransferOwnershipPdu#receivingEntityID}*/
-public TransferOwnershipPdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
-    receivingEntityID = pReceivingEntityID;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
-{
-    return receivingEntityID; 
-}
-
-/** Setter for {@link TransferOwnershipPdu#requestID}*/
-public TransferOwnershipPdu setRequestID(int pRequestID)
-{
-    requestID = pRequestID;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#requestID}*/
-public int getRequestID()
-{
-    return requestID; 
-}
-
-/** Setter for {@link TransferOwnershipPdu#requiredReliabilityService}*/
-public TransferOwnershipPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
-    requiredReliabilityService = pRequiredReliabilityService;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
-{
-    return requiredReliabilityService; 
-}
-
-/** Setter for {@link TransferOwnershipPdu#transferType}*/
-public TransferOwnershipPdu setTransferType(TransferControlTransferType pTransferType)
-{
-    transferType = pTransferType;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#transferType}*/
-public TransferControlTransferType getTransferType()
-{
-    return transferType; 
-}
-
-/** Setter for {@link TransferOwnershipPdu#transferEntityID}*/
-public TransferOwnershipPdu setTransferEntityID(EntityID pTransferEntityID)
-{
-    transferEntityID = pTransferEntityID;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#transferEntityID}*/
-public EntityID getTransferEntityID()
-{
-    return transferEntityID; 
-}
-
-/** Setter for {@link TransferOwnershipPdu#recordSets}*/
-public TransferOwnershipPdu setRecordSets(RecordSpecification pRecordSets)
-{
-    recordSets = pRecordSets;
-    return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#recordSets}*/
-public RecordSpecification getRecordSets()
-{
-    return recordSets; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       originatingEntityID.marshal(dos);
-       receivingEntityID.marshal(dos);
-       dos.writeInt(requestID);
-       requiredReliabilityService.marshal(dos);
-       transferType.marshal(dos);
-       transferEntityID.marshal(dos);
-       recordSets.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += originatingEntityID.unmarshal(dis);
-        uPosition += receivingEntityID.unmarshal(dis);
-        requestID = dis.readInt();
-        uPosition += 4;
-        requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
-        uPosition += requiredReliabilityService.getMarshalledSize();
-        transferType = TransferControlTransferType.unmarshalEnum(dis);
-        uPosition += transferType.getMarshalledSize();
-        uPosition += transferEntityID.unmarshal(dis);
-        uPosition += recordSets.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   originatingEntityID.marshal(buff);
-   receivingEntityID.marshal(buff);
-   buff.putInt( (int)requestID);
-   requiredReliabilityService.marshal(buff);
-   transferType.marshal(buff);
-   transferEntityID.marshal(buff);
-   recordSets.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    originatingEntityID.unmarshal(buff);
-    receivingEntityID.unmarshal(buff);
-    requestID = buff.getInt();
-    requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
-    transferType = TransferControlTransferType.unmarshalEnum(buff);
-    transferEntityID.unmarshal(buff);
-    recordSets.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final TransferOwnershipPdu rhs = (TransferOwnershipPdu)obj;
-
-     if( ! (originatingEntityID.equals( rhs.originatingEntityID) )) ivarsEqual = false;
-     if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
-     if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-     if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
-     if( ! (transferType == rhs.transferType)) ivarsEqual = false;
-     if( ! (transferEntityID.equals( rhs.transferEntityID) )) ivarsEqual = false;
-     if( ! (recordSets.equals( rhs.recordSets) )) ivarsEqual = false;
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" originatingEntityID: ").append(originatingEntityID).append("\n");
-    sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
-    sb.append(" requestID: ").append(requestID).append("\n");
-    sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
-    sb.append(" transferType: ").append(transferType).append("\n");
-    sb.append(" transferEntityID: ").append(transferEntityID).append("\n");
-    sb.append(" recordSets: ").append(recordSets).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
deleted file mode 100644
index 81c4bea538298c4718e33ec434c234a766c6c545..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.3 Communicates the state of a particular radio transmitter or simple intercom.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class TransmitterPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
-   protected RadioCommsHeader  header = new RadioCommsHeader(); 
-
-   /** particular radio within an entity */
-   protected short  radioNumber;
-
-   /** Type of radio */
-   protected RadioType  radioEntityType = new RadioType(); 
-
-   /** transmit state uid 164 */
-   protected TransmitterTransmitState transmitState = TransmitterTransmitState.values()[0];
-
-   /** input source uid 165 */
-   protected TransmitterInputSource inputSource = TransmitterInputSource.values()[0];
-
-   /** count field */
-   protected short  variableTransmitterParameterCount;
-
-   /** Location of antenna */
-   protected Vector3Double  antennaLocation = new Vector3Double(); 
-
-   /** relative location of antenna */
-   protected Vector3Float  relativeAntennaLocation = new Vector3Float(); 
-
-   /** antenna pattern type uid 167 */
-   protected TransmitterAntennaPatternType antennaPatternType = TransmitterAntennaPatternType.values()[0];
-
-   /** atenna pattern length */
-   protected short  antennaPatternCount;
-
-   /** frequency */
-   protected long  frequency;
-
-   /** transmit frequency Bandwidth */
-   protected float  transmitFrequencyBandwidth;
-
-   /** transmission power */
-   protected float  power;
-
-   /** modulation */
-   protected ModulationType  modulationType = new ModulationType(); 
-
-   /** crypto system enumeration uid 166 */
-   protected TransmitterCryptoSystem cryptoSystem = TransmitterCryptoSystem.values()[0];
-
-   /** crypto system key identifer */
-   protected short  cryptoKeyId;
-
-   /** how many modulation parameters we have */
-   protected byte  modulationParameterCount;
-
-   protected byte  padding1 = (byte)0;
-
-   protected short  padding2 = (short)0;
-
-   /** variable length list of modulation parameters */
-   protected List< ModulationParameters > modulationParametersList = new ArrayList< ModulationParameters >();
- 
-   /** variable length list of antenna pattern records */
-   protected List< VariableTransmitterParameters > antennaPatternList = new ArrayList< VariableTransmitterParameters >();
- 
-
-/** Constructor */
- public TransmitterPdu()
- {
-    setPduType( DISPDUType.TRANSMITTER );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += header.getMarshalledSize();
-   marshalSize += 2;  // radioNumber
-   marshalSize += radioEntityType.getMarshalledSize();
-   marshalSize += transmitState.getMarshalledSize();
-   marshalSize += inputSource.getMarshalledSize();
-   marshalSize += 2;  // variableTransmitterParameterCount
-   marshalSize += antennaLocation.getMarshalledSize();
-   marshalSize += relativeAntennaLocation.getMarshalledSize();
-   marshalSize += antennaPatternType.getMarshalledSize();
-   marshalSize += 2;  // antennaPatternCount
-   marshalSize += 8;  // frequency
-   marshalSize += 4;  // transmitFrequencyBandwidth
-   marshalSize += 4;  // power
-   marshalSize += modulationType.getMarshalledSize();
-   marshalSize += cryptoSystem.getMarshalledSize();
-   marshalSize += 2;  // cryptoKeyId
-   marshalSize += 1;  // modulationParameterCount
-   marshalSize += 1;  // padding1
-   marshalSize += 2;  // padding2
-   for(int idx=0; idx < modulationParametersList.size(); idx++)
-   {
-        ModulationParameters listElement = modulationParametersList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < antennaPatternList.size(); idx++)
-   {
-        VariableTransmitterParameters listElement = antennaPatternList.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link TransmitterPdu#header}*/
-public TransmitterPdu setHeader(RadioCommsHeader pHeader)
-{
-    header = pHeader;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#header}*/
-public RadioCommsHeader getHeader()
-{
-    return header; 
-}
-
-/** Setter for {@link TransmitterPdu#radioNumber}*/
-public TransmitterPdu setRadioNumber(short pRadioNumber)
-{
-    radioNumber = pRadioNumber;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#radioNumber}*/
-public short getRadioNumber()
-{
-    return radioNumber; 
-}
-
-/** Setter for {@link TransmitterPdu#radioEntityType}*/
-public TransmitterPdu setRadioEntityType(RadioType pRadioEntityType)
-{
-    radioEntityType = pRadioEntityType;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#radioEntityType}*/
-public RadioType getRadioEntityType()
-{
-    return radioEntityType; 
-}
-
-/** Setter for {@link TransmitterPdu#transmitState}*/
-public TransmitterPdu setTransmitState(TransmitterTransmitState pTransmitState)
-{
-    transmitState = pTransmitState;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#transmitState}*/
-public TransmitterTransmitState getTransmitState()
-{
-    return transmitState; 
-}
-
-/** Setter for {@link TransmitterPdu#inputSource}*/
-public TransmitterPdu setInputSource(TransmitterInputSource pInputSource)
-{
-    inputSource = pInputSource;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#inputSource}*/
-public TransmitterInputSource getInputSource()
-{
-    return inputSource; 
-}
-
-/** Setter for {@link TransmitterPdu#variableTransmitterParameterCount}*/
-public TransmitterPdu setVariableTransmitterParameterCount(short pVariableTransmitterParameterCount)
-{
-    variableTransmitterParameterCount = pVariableTransmitterParameterCount;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#variableTransmitterParameterCount}*/
-public short getVariableTransmitterParameterCount()
-{
-    return variableTransmitterParameterCount; 
-}
-
-/** Setter for {@link TransmitterPdu#antennaLocation}*/
-public TransmitterPdu setAntennaLocation(Vector3Double pAntennaLocation)
-{
-    antennaLocation = pAntennaLocation;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#antennaLocation}*/
-public Vector3Double getAntennaLocation()
-{
-    return antennaLocation; 
-}
-
-/** Setter for {@link TransmitterPdu#relativeAntennaLocation}*/
-public TransmitterPdu setRelativeAntennaLocation(Vector3Float pRelativeAntennaLocation)
-{
-    relativeAntennaLocation = pRelativeAntennaLocation;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#relativeAntennaLocation}*/
-public Vector3Float getRelativeAntennaLocation()
-{
-    return relativeAntennaLocation; 
-}
-
-/** Setter for {@link TransmitterPdu#antennaPatternType}*/
-public TransmitterPdu setAntennaPatternType(TransmitterAntennaPatternType pAntennaPatternType)
-{
-    antennaPatternType = pAntennaPatternType;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#antennaPatternType}*/
-public TransmitterAntennaPatternType getAntennaPatternType()
-{
-    return antennaPatternType; 
-}
-
-/** Setter for {@link TransmitterPdu#frequency}*/
-public TransmitterPdu setFrequency(long pFrequency)
-{
-    frequency = pFrequency;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#frequency}*/
-public long getFrequency()
-{
-    return frequency; 
-}
-
-/** Setter for {@link TransmitterPdu#transmitFrequencyBandwidth}*/
-public TransmitterPdu setTransmitFrequencyBandwidth(float pTransmitFrequencyBandwidth)
-{
-    transmitFrequencyBandwidth = pTransmitFrequencyBandwidth;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#transmitFrequencyBandwidth}*/
-public float getTransmitFrequencyBandwidth()
-{
-    return transmitFrequencyBandwidth; 
-}
-
-/** Setter for {@link TransmitterPdu#power}*/
-public TransmitterPdu setPower(float pPower)
-{
-    power = pPower;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#power}*/
-public float getPower()
-{
-    return power; 
-}
-
-/** Setter for {@link TransmitterPdu#modulationType}*/
-public TransmitterPdu setModulationType(ModulationType pModulationType)
-{
-    modulationType = pModulationType;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#modulationType}*/
-public ModulationType getModulationType()
-{
-    return modulationType; 
-}
-
-/** Setter for {@link TransmitterPdu#cryptoSystem}*/
-public TransmitterPdu setCryptoSystem(TransmitterCryptoSystem pCryptoSystem)
-{
-    cryptoSystem = pCryptoSystem;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#cryptoSystem}*/
-public TransmitterCryptoSystem getCryptoSystem()
-{
-    return cryptoSystem; 
-}
-
-/** Setter for {@link TransmitterPdu#cryptoKeyId}*/
-public TransmitterPdu setCryptoKeyId(short pCryptoKeyId)
-{
-    cryptoKeyId = pCryptoKeyId;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#cryptoKeyId}*/
-public short getCryptoKeyId()
-{
-    return cryptoKeyId; 
-}
-
-/** Setter for {@link TransmitterPdu#padding1}*/
-public TransmitterPdu setPadding1(byte pPadding1)
-{
-    padding1 = pPadding1;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#padding1}*/
-public byte getPadding1()
-{
-    return padding1; 
-}
-
-/** Setter for {@link TransmitterPdu#padding2}*/
-public TransmitterPdu setPadding2(short pPadding2)
-{
-    padding2 = pPadding2;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#padding2}*/
-public short getPadding2()
-{
-    return padding2; 
-}
-
-/** Setter for {@link TransmitterPdu#modulationParametersList}*/
-public TransmitterPdu setModulationParametersList(List<ModulationParameters> pModulationParametersList)
-{
-    modulationParametersList = pModulationParametersList;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#modulationParametersList}*/
-public List<ModulationParameters> getModulationParametersList()
-{
-    return modulationParametersList; 
-}
-
-/** Setter for {@link TransmitterPdu#antennaPatternList}*/
-public TransmitterPdu setAntennaPatternList(List<VariableTransmitterParameters> pAntennaPatternList)
-{
-    antennaPatternList = pAntennaPatternList;
-    return this;
-}
-
-/** Getter for {@link TransmitterPdu#antennaPatternList}*/
-public List<VariableTransmitterParameters> getAntennaPatternList()
-{
-    return antennaPatternList; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       header.marshal(dos);
-       dos.writeShort(radioNumber);
-       radioEntityType.marshal(dos);
-       transmitState.marshal(dos);
-       inputSource.marshal(dos);
-       dos.writeShort(variableTransmitterParameterCount);
-       antennaLocation.marshal(dos);
-       relativeAntennaLocation.marshal(dos);
-       antennaPatternType.marshal(dos);
-       dos.writeShort(antennaPatternList.size());
-       dos.writeLong(frequency);
-       dos.writeFloat(transmitFrequencyBandwidth);
-       dos.writeFloat(power);
-       modulationType.marshal(dos);
-       cryptoSystem.marshal(dos);
-       dos.writeShort(cryptoKeyId);
-       dos.writeByte(modulationParametersList.size());
-       dos.writeByte(padding1);
-       dos.writeShort(padding2);
-
-       for(int idx = 0; idx < modulationParametersList.size(); idx++)
-       {
-            ModulationParameters aModulationParameters = modulationParametersList.get(idx);
-            aModulationParameters.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < antennaPatternList.size(); idx++)
-       {
-            VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
-            aVariableTransmitterParameters.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += header.unmarshal(dis);
-        radioNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += radioEntityType.unmarshal(dis);
-        transmitState = TransmitterTransmitState.unmarshalEnum(dis);
-        uPosition += transmitState.getMarshalledSize();
-        inputSource = TransmitterInputSource.unmarshalEnum(dis);
-        uPosition += inputSource.getMarshalledSize();
-        variableTransmitterParameterCount = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += antennaLocation.unmarshal(dis);
-        uPosition += relativeAntennaLocation.unmarshal(dis);
-        antennaPatternType = TransmitterAntennaPatternType.unmarshalEnum(dis);
-        uPosition += antennaPatternType.getMarshalledSize();
-        antennaPatternCount = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        frequency = dis.readLong();
-        uPosition += 4;
-        transmitFrequencyBandwidth = dis.readFloat();
-        uPosition += 4;
-        power = dis.readFloat();
-        uPosition += 4;
-        uPosition += modulationType.unmarshal(dis);
-        cryptoSystem = TransmitterCryptoSystem.unmarshalEnum(dis);
-        uPosition += cryptoSystem.getMarshalledSize();
-        cryptoKeyId = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        modulationParameterCount = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding1 = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding2 = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < modulationParameterCount; idx++)
-        {
-            ModulationParameters anX = new ModulationParameters();
-            uPosition += anX.unmarshal(dis);
-            modulationParametersList.add(anX);
-        }
-
-        for(int idx = 0; idx < antennaPatternCount; idx++)
-        {
-            VariableTransmitterParameters anX = new VariableTransmitterParameters();
-            uPosition += anX.unmarshal(dis);
-            antennaPatternList.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   header.marshal(buff);
-   buff.putShort( (short)radioNumber);
-   radioEntityType.marshal(buff);
-   transmitState.marshal(buff);
-   inputSource.marshal(buff);
-   buff.putShort( (short)variableTransmitterParameterCount);
-   antennaLocation.marshal(buff);
-   relativeAntennaLocation.marshal(buff);
-   antennaPatternType.marshal(buff);
-   buff.putShort( (short)antennaPatternList.size());
-   buff.putLong( (long)frequency);
-   buff.putFloat( (float)transmitFrequencyBandwidth);
-   buff.putFloat( (float)power);
-   modulationType.marshal(buff);
-   cryptoSystem.marshal(buff);
-   buff.putShort( (short)cryptoKeyId);
-   buff.put( (byte)modulationParametersList.size());
-   buff.put( (byte)padding1);
-   buff.putShort( (short)padding2);
-
-   for(int idx = 0; idx < modulationParametersList.size(); idx++)
-   {
-        ModulationParameters aModulationParameters = modulationParametersList.get(idx);
-        aModulationParameters.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < antennaPatternList.size(); idx++)
-   {
-        VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
-        aVariableTransmitterParameters.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    header.unmarshal(buff);
-    radioNumber = (short)(buff.getShort() & 0xFFFF);
-    radioEntityType.unmarshal(buff);
-    transmitState = TransmitterTransmitState.unmarshalEnum(buff);
-    inputSource = TransmitterInputSource.unmarshalEnum(buff);
-    variableTransmitterParameterCount = (short)(buff.getShort() & 0xFFFF);
-    antennaLocation.unmarshal(buff);
-    relativeAntennaLocation.unmarshal(buff);
-    antennaPatternType = TransmitterAntennaPatternType.unmarshalEnum(buff);
-    antennaPatternCount = (short)(buff.getShort() & 0xFFFF);
-    frequency = buff.getLong();
-    transmitFrequencyBandwidth = buff.getFloat();
-    power = buff.getFloat();
-    modulationType.unmarshal(buff);
-    cryptoSystem = TransmitterCryptoSystem.unmarshalEnum(buff);
-    cryptoKeyId = (short)(buff.getShort() & 0xFFFF);
-    modulationParameterCount = (byte)(buff.get() & 0xFF);
-    padding1 = (byte)(buff.get() & 0xFF);
-    padding2 = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < modulationParameterCount; idx++)
-    {
-    ModulationParameters anX = new ModulationParameters();
-    anX.unmarshal(buff);
-    modulationParametersList.add(anX);
-    }
-
-    for(int idx = 0; idx < antennaPatternCount; idx++)
-    {
-    VariableTransmitterParameters anX = new VariableTransmitterParameters();
-    anX.unmarshal(buff);
-    antennaPatternList.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final TransmitterPdu rhs = (TransmitterPdu)obj;
-
-     if( ! (header.equals( rhs.header) )) ivarsEqual = false;
-     if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
-     if( ! (radioEntityType.equals( rhs.radioEntityType) )) ivarsEqual = false;
-     if( ! (transmitState == rhs.transmitState)) ivarsEqual = false;
-     if( ! (inputSource == rhs.inputSource)) ivarsEqual = false;
-     if( ! (variableTransmitterParameterCount == rhs.variableTransmitterParameterCount)) ivarsEqual = false;
-     if( ! (antennaLocation.equals( rhs.antennaLocation) )) ivarsEqual = false;
-     if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
-     if( ! (antennaPatternType == rhs.antennaPatternType)) ivarsEqual = false;
-     if( ! (frequency == rhs.frequency)) ivarsEqual = false;
-     if( ! (transmitFrequencyBandwidth == rhs.transmitFrequencyBandwidth)) ivarsEqual = false;
-     if( ! (power == rhs.power)) ivarsEqual = false;
-     if( ! (modulationType.equals( rhs.modulationType) )) ivarsEqual = false;
-     if( ! (cryptoSystem == rhs.cryptoSystem)) ivarsEqual = false;
-     if( ! (cryptoKeyId == rhs.cryptoKeyId)) ivarsEqual = false;
-     if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-     if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
-     for(int idx = 0; idx < modulationParametersList.size(); idx++)
-        if( ! ( modulationParametersList.get(idx).equals(rhs.modulationParametersList.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < antennaPatternList.size(); idx++)
-        if( ! ( antennaPatternList.get(idx).equals(rhs.antennaPatternList.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" header: ").append(header).append("\n");
-    sb.append(" radioNumber: ").append(radioNumber).append("\n");
-    sb.append(" radioEntityType: ").append(radioEntityType).append("\n");
-    sb.append(" transmitState: ").append(transmitState).append("\n");
-    sb.append(" inputSource: ").append(inputSource).append("\n");
-    sb.append(" variableTransmitterParameterCount: ").append(variableTransmitterParameterCount).append("\n");
-    sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
-    sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
-    sb.append(" antennaPatternType: ").append(antennaPatternType).append("\n");
-    sb.append(" frequency: ").append(frequency).append("\n");
-    sb.append(" transmitFrequencyBandwidth: ").append(transmitFrequencyBandwidth).append("\n");
-    sb.append(" power: ").append(power).append("\n");
-    sb.append(" modulationType: ").append(modulationType).append("\n");
-    sb.append(" cryptoSystem: ").append(cryptoSystem).append("\n");
-    sb.append(" cryptoKeyId: ").append(cryptoKeyId).append("\n");
-    sb.append(" padding1: ").append(padding1).append("\n");
-    sb.append(" padding2: ").append(padding2).append("\n");
-    sb.append(" modulationParametersList: ").append("\n");
-    modulationParametersList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" antennaPatternList: ").append("\n");
-    antennaPatternList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UABeam.java b/src-generated/edu/nps/moves/dis7/UABeam.java
deleted file mode 100644
index b3865b53bee9b6181e0f5ad7121766b397d3a3a0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/UABeam.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class UABeam extends Object implements Serializable
-{
-   protected byte  beamDataLength;
-
-   protected byte  beamNumber;
-
-   protected short  padding;
-
-   protected UAFundamentalParameter  fundamentalParameterData = new UAFundamentalParameter(); 
-
-
-/** Constructor */
- public UABeam()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // beamDataLength
-   marshalSize += 1;  // beamNumber
-   marshalSize += 2;  // padding
-   marshalSize += fundamentalParameterData.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link UABeam#beamDataLength}*/
-public UABeam setBeamDataLength(byte pBeamDataLength)
-{
-    beamDataLength = pBeamDataLength;
-    return this;
-}
-
-/** Getter for {@link UABeam#beamDataLength}*/
-public byte getBeamDataLength()
-{
-    return beamDataLength; 
-}
-
-/** Setter for {@link UABeam#beamNumber}*/
-public UABeam setBeamNumber(byte pBeamNumber)
-{
-    beamNumber = pBeamNumber;
-    return this;
-}
-
-/** Getter for {@link UABeam#beamNumber}*/
-public byte getBeamNumber()
-{
-    return beamNumber; 
-}
-
-/** Setter for {@link UABeam#padding}*/
-public UABeam setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link UABeam#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link UABeam#fundamentalParameterData}*/
-public UABeam setFundamentalParameterData(UAFundamentalParameter pFundamentalParameterData)
-{
-    fundamentalParameterData = pFundamentalParameterData;
-    return this;
-}
-
-/** Getter for {@link UABeam#fundamentalParameterData}*/
-public UAFundamentalParameter getFundamentalParameterData()
-{
-    return fundamentalParameterData; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(beamDataLength);
-       dos.writeByte(beamNumber);
-       dos.writeShort(padding);
-       fundamentalParameterData.marshal(dos);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        beamDataLength = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        beamNumber = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += fundamentalParameterData.unmarshal(dis);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)beamDataLength);
-   buff.put( (byte)beamNumber);
-   buff.putShort( (short)padding);
-   fundamentalParameterData.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    beamDataLength = (byte)(buff.get() & 0xFF);
-    beamNumber = (byte)(buff.get() & 0xFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    fundamentalParameterData.unmarshal(buff);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final UABeam rhs = (UABeam)obj;
-
-     if( ! (beamDataLength == rhs.beamDataLength)) ivarsEqual = false;
-     if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
-    sb.append(" beamNumber: ").append(beamNumber).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UAEmitter.java b/src-generated/edu/nps/moves/dis7/UAEmitter.java
deleted file mode 100644
index e22acf7cd6ab81074c3e04dbf129722c50ed11f7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/UAEmitter.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class UAEmitter extends Object implements Serializable
-{
-   /**  this field shall specify the length of this emitter system's data in 32-bit words. */
-   protected byte  systemDataLength;
-
-   /** the number of beams being described in the current PDU for the emitter system being described. */
-   protected byte  numberOfBeams;
-
-   protected short  padding;
-
-   /** TODO */
-   protected AcousticEmitter  acousticEmitter = new AcousticEmitter(); 
-
-   /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95  */
-   protected Vector3Float  location = new Vector3Float(); 
-
-   /** Electronic emission beams */
-   protected List< UABeam > beams = new ArrayList< UABeam >();
- 
-
-/** Constructor */
- public UAEmitter()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 1;  // systemDataLength
-   marshalSize += 1;  // numberOfBeams
-   marshalSize += 2;  // padding
-   marshalSize += acousticEmitter.getMarshalledSize();
-   marshalSize += location.getMarshalledSize();
-   for(int idx=0; idx < beams.size(); idx++)
-   {
-        UABeam listElement = beams.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link UAEmitter#systemDataLength}*/
-public UAEmitter setSystemDataLength(byte pSystemDataLength)
-{
-    systemDataLength = pSystemDataLength;
-    return this;
-}
-
-/** Getter for {@link UAEmitter#systemDataLength}*/
-public byte getSystemDataLength()
-{
-    return systemDataLength; 
-}
-
-/** Setter for {@link UAEmitter#padding}*/
-public UAEmitter setPadding(short pPadding)
-{
-    padding = pPadding;
-    return this;
-}
-
-/** Getter for {@link UAEmitter#padding}*/
-public short getPadding()
-{
-    return padding; 
-}
-
-/** Setter for {@link UAEmitter#acousticEmitter}*/
-public UAEmitter setAcousticEmitter(AcousticEmitter pAcousticEmitter)
-{
-    acousticEmitter = pAcousticEmitter;
-    return this;
-}
-
-/** Getter for {@link UAEmitter#acousticEmitter}*/
-public AcousticEmitter getAcousticEmitter()
-{
-    return acousticEmitter; 
-}
-
-/** Setter for {@link UAEmitter#location}*/
-public UAEmitter setLocation(Vector3Float pLocation)
-{
-    location = pLocation;
-    return this;
-}
-
-/** Getter for {@link UAEmitter#location}*/
-public Vector3Float getLocation()
-{
-    return location; 
-}
-
-/** Setter for {@link UAEmitter#beams}*/
-public UAEmitter setBeams(List<UABeam> pBeams)
-{
-    beams = pBeams;
-    return this;
-}
-
-/** Getter for {@link UAEmitter#beams}*/
-public List<UABeam> getBeams()
-{
-    return beams; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeByte(systemDataLength);
-       dos.writeByte(beams.size());
-       dos.writeShort(padding);
-       acousticEmitter.marshal(dos);
-       location.marshal(dos);
-
-       for(int idx = 0; idx < beams.size(); idx++)
-       {
-            UABeam aUABeam = beams.get(idx);
-            aUABeam.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        systemDataLength = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfBeams = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        padding = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        uPosition += acousticEmitter.unmarshal(dis);
-        uPosition += location.unmarshal(dis);
-        for(int idx = 0; idx < numberOfBeams; idx++)
-        {
-            UABeam anX = new UABeam();
-            uPosition += anX.unmarshal(dis);
-            beams.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.put( (byte)systemDataLength);
-   buff.put( (byte)beams.size());
-   buff.putShort( (short)padding);
-   acousticEmitter.marshal(buff);
-   location.marshal(buff);
-
-   for(int idx = 0; idx < beams.size(); idx++)
-   {
-        UABeam aUABeam = beams.get(idx);
-        aUABeam.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    systemDataLength = (byte)(buff.get() & 0xFF);
-    numberOfBeams = (byte)(buff.get() & 0xFF);
-    padding = (short)(buff.getShort() & 0xFFFF);
-    acousticEmitter.unmarshal(buff);
-    location.unmarshal(buff);
-    for(int idx = 0; idx < numberOfBeams; idx++)
-    {
-    UABeam anX = new UABeam();
-    anX.unmarshal(buff);
-    beams.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final UAEmitter rhs = (UAEmitter)obj;
-
-     if( ! (systemDataLength == rhs.systemDataLength)) ivarsEqual = false;
-     if( ! (padding == rhs.padding)) ivarsEqual = false;
-     if( ! (acousticEmitter.equals( rhs.acousticEmitter) )) ivarsEqual = false;
-     if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-
-     for(int idx = 0; idx < beams.size(); idx++)
-        if( ! ( beams.get(idx).equals(rhs.beams.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-    sb.append(" acousticEmitter: ").append(acousticEmitter).append("\n");
-    sb.append(" location: ").append(location).append("\n");
-    sb.append(" beams: ").append("\n");
-    beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
deleted file mode 100644
index 94191130e0e15b9440af3351edd52408fb5304bd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.91
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class UAFundamentalParameter extends Object implements Serializable
-{
-   /** Which database record shall be used uid 146 */
-   protected UAActiveEmissionParameterIndex activeEmissionParameterIndex = UAActiveEmissionParameterIndex.values()[0];
-
-   /** The type of scan pattern, If not used, zero uid 147 */
-   protected UAScanPattern scanPattern = UAScanPattern.values()[0];
-
-   /** center azimuth bearing of th emain beam. In radians. */
-   protected float  beamCenterAzimuthHorizontal;
-
-   /** Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians. */
-   protected float  azimuthalBeamwidthHorizontal;
-
-   /** center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians. */
-   protected float  beamCenterDepressionElevation;
-
-   /** vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians. */
-   protected float  depressionElevationBeamWidth;
-
-
-/** Constructor */
- public UAFundamentalParameter()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += activeEmissionParameterIndex.getMarshalledSize();
-   marshalSize += scanPattern.getMarshalledSize();
-   marshalSize += 4;  // beamCenterAzimuthHorizontal
-   marshalSize += 4;  // azimuthalBeamwidthHorizontal
-   marshalSize += 4;  // beamCenterDepressionElevation
-   marshalSize += 4;  // depressionElevationBeamWidth
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link UAFundamentalParameter#activeEmissionParameterIndex}*/
-public UAFundamentalParameter setActiveEmissionParameterIndex(UAActiveEmissionParameterIndex pActiveEmissionParameterIndex)
-{
-    activeEmissionParameterIndex = pActiveEmissionParameterIndex;
-    return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#activeEmissionParameterIndex}*/
-public UAActiveEmissionParameterIndex getActiveEmissionParameterIndex()
-{
-    return activeEmissionParameterIndex; 
-}
-
-/** Setter for {@link UAFundamentalParameter#scanPattern}*/
-public UAFundamentalParameter setScanPattern(UAScanPattern pScanPattern)
-{
-    scanPattern = pScanPattern;
-    return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#scanPattern}*/
-public UAScanPattern getScanPattern()
-{
-    return scanPattern; 
-}
-
-/** Setter for {@link UAFundamentalParameter#beamCenterAzimuthHorizontal}*/
-public UAFundamentalParameter setBeamCenterAzimuthHorizontal(float pBeamCenterAzimuthHorizontal)
-{
-    beamCenterAzimuthHorizontal = pBeamCenterAzimuthHorizontal;
-    return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#beamCenterAzimuthHorizontal}*/
-public float getBeamCenterAzimuthHorizontal()
-{
-    return beamCenterAzimuthHorizontal; 
-}
-
-/** Setter for {@link UAFundamentalParameter#azimuthalBeamwidthHorizontal}*/
-public UAFundamentalParameter setAzimuthalBeamwidthHorizontal(float pAzimuthalBeamwidthHorizontal)
-{
-    azimuthalBeamwidthHorizontal = pAzimuthalBeamwidthHorizontal;
-    return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#azimuthalBeamwidthHorizontal}*/
-public float getAzimuthalBeamwidthHorizontal()
-{
-    return azimuthalBeamwidthHorizontal; 
-}
-
-/** Setter for {@link UAFundamentalParameter#beamCenterDepressionElevation}*/
-public UAFundamentalParameter setBeamCenterDepressionElevation(float pBeamCenterDepressionElevation)
-{
-    beamCenterDepressionElevation = pBeamCenterDepressionElevation;
-    return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#beamCenterDepressionElevation}*/
-public float getBeamCenterDepressionElevation()
-{
-    return beamCenterDepressionElevation; 
-}
-
-/** Setter for {@link UAFundamentalParameter#depressionElevationBeamWidth}*/
-public UAFundamentalParameter setDepressionElevationBeamWidth(float pDepressionElevationBeamWidth)
-{
-    depressionElevationBeamWidth = pDepressionElevationBeamWidth;
-    return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#depressionElevationBeamWidth}*/
-public float getDepressionElevationBeamWidth()
-{
-    return depressionElevationBeamWidth; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       activeEmissionParameterIndex.marshal(dos);
-       scanPattern.marshal(dos);
-       dos.writeFloat(beamCenterAzimuthHorizontal);
-       dos.writeFloat(azimuthalBeamwidthHorizontal);
-       dos.writeFloat(beamCenterDepressionElevation);
-       dos.writeFloat(depressionElevationBeamWidth);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        activeEmissionParameterIndex = UAActiveEmissionParameterIndex.unmarshalEnum(dis);
-        uPosition += activeEmissionParameterIndex.getMarshalledSize();
-        scanPattern = UAScanPattern.unmarshalEnum(dis);
-        uPosition += scanPattern.getMarshalledSize();
-        beamCenterAzimuthHorizontal = dis.readFloat();
-        uPosition += 4;
-        azimuthalBeamwidthHorizontal = dis.readFloat();
-        uPosition += 4;
-        beamCenterDepressionElevation = dis.readFloat();
-        uPosition += 4;
-        depressionElevationBeamWidth = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   activeEmissionParameterIndex.marshal(buff);
-   scanPattern.marshal(buff);
-   buff.putFloat( (float)beamCenterAzimuthHorizontal);
-   buff.putFloat( (float)azimuthalBeamwidthHorizontal);
-   buff.putFloat( (float)beamCenterDepressionElevation);
-   buff.putFloat( (float)depressionElevationBeamWidth);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    activeEmissionParameterIndex = UAActiveEmissionParameterIndex.unmarshalEnum(buff);
-    scanPattern = UAScanPattern.unmarshalEnum(buff);
-    beamCenterAzimuthHorizontal = buff.getFloat();
-    azimuthalBeamwidthHorizontal = buff.getFloat();
-    beamCenterDepressionElevation = buff.getFloat();
-    depressionElevationBeamWidth = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final UAFundamentalParameter rhs = (UAFundamentalParameter)obj;
-
-     if( ! (activeEmissionParameterIndex == rhs.activeEmissionParameterIndex)) ivarsEqual = false;
-     if( ! (scanPattern == rhs.scanPattern)) ivarsEqual = false;
-     if( ! (beamCenterAzimuthHorizontal == rhs.beamCenterAzimuthHorizontal)) ivarsEqual = false;
-     if( ! (azimuthalBeamwidthHorizontal == rhs.azimuthalBeamwidthHorizontal)) ivarsEqual = false;
-     if( ! (beamCenterDepressionElevation == rhs.beamCenterDepressionElevation)) ivarsEqual = false;
-     if( ! (depressionElevationBeamWidth == rhs.depressionElevationBeamWidth)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" activeEmissionParameterIndex: ").append(activeEmissionParameterIndex).append("\n");
-    sb.append(" scanPattern: ").append(scanPattern).append("\n");
-    sb.append(" beamCenterAzimuthHorizontal: ").append(beamCenterAzimuthHorizontal).append("\n");
-    sb.append(" azimuthalBeamwidthHorizontal: ").append(azimuthalBeamwidthHorizontal).append("\n");
-    sb.append(" beamCenterDepressionElevation: ").append(beamCenterDepressionElevation).append("\n");
-    sb.append(" depressionElevationBeamWidth: ").append(depressionElevationBeamWidth).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
deleted file mode 100644
index 2e24aeb87abd7ee7ae7a44b652ce4997790b1bdd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of one or more unattached radios in an event or exercise Section 6.2.91
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class UnattachedIdentifier extends Object implements Serializable
-{
-   /** See 6.2.79 */
-   protected SimulationAddress  simulationAddress = new SimulationAddress(); 
-
-   /** Reference number */
-   protected short  referenceNumber;
-
-
-/** Constructor */
- public UnattachedIdentifier()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += simulationAddress.getMarshalledSize();
-   marshalSize += 2;  // referenceNumber
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link UnattachedIdentifier#simulationAddress}*/
-public UnattachedIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
-{
-    simulationAddress = pSimulationAddress;
-    return this;
-}
-
-/** Getter for {@link UnattachedIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
-{
-    return simulationAddress; 
-}
-
-/** Setter for {@link UnattachedIdentifier#referenceNumber}*/
-public UnattachedIdentifier setReferenceNumber(short pReferenceNumber)
-{
-    referenceNumber = pReferenceNumber;
-    return this;
-}
-
-/** Getter for {@link UnattachedIdentifier#referenceNumber}*/
-public short getReferenceNumber()
-{
-    return referenceNumber; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       simulationAddress.marshal(dos);
-       dos.writeShort(referenceNumber);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        uPosition += simulationAddress.unmarshal(dis);
-        referenceNumber = (short)dis.readUnsignedShort();
-        uPosition += 2;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   simulationAddress.marshal(buff);
-   buff.putShort( (short)referenceNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    simulationAddress.unmarshal(buff);
-    referenceNumber = (short)(buff.getShort() & 0xFFFF);
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final UnattachedIdentifier rhs = (UnattachedIdentifier)obj;
-
-     if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
-     if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
-    sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
deleted file mode 100644
index e570bbd834d86cf54046f4370ae12a502daa22f0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.4 Information about underwater acoustic emmissions. See 5.7.5.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class UnderwaterAcousticPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
-   /** ID of the entity that is the source of the emission */
-   protected EntityID  emittingEntityID = new EntityID(); 
-
-   /** ID of event */
-   protected EventIdentifier  eventID = new EventIdentifier(); 
-
-   /** This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU uid 143 */
-   protected UAStateChangeUpdateIndicator stateChangeIndicator = UAStateChangeUpdateIndicator.values()[0];
-
-   /** padding */
-   protected byte  pad;
-
-   /** This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries. uid 148 */
-   protected UAPassiveParameterIndex passiveParameterIndex = UAPassiveParameterIndex.values()[0];
-
-   /** This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity. */
-   protected byte  propulsionPlantConfiguration;
-
-   /**  This field shall represent the number of shafts on a platform */
-   protected byte  numberOfShafts;
-
-   /** This field shall indicate the number of APAs described in the current UA PDU */
-   protected byte  numberOfAPAs;
-
-   /** This field shall specify the number of UA emitter systems being described in the current UA PDU */
-   protected byte  numberOfUAEmitterSystems;
-
-   /** shaft RPM values. */
-   protected List< ShaftRPM > shaftRPMs = new ArrayList< ShaftRPM >();
- 
-   /** additional passive activities */
-   protected List< APA > apaData = new ArrayList< APA >();
- 
-   protected List< UAEmitter > emitterSystems = new ArrayList< UAEmitter >();
- 
-
-/** Constructor */
- public UnderwaterAcousticPdu()
- {
-    setPduType( DISPDUType.UNDERWATER_ACOUSTIC );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-   marshalSize += emittingEntityID.getMarshalledSize();
-   marshalSize += eventID.getMarshalledSize();
-   marshalSize += stateChangeIndicator.getMarshalledSize();
-   marshalSize += 1;  // pad
-   marshalSize += passiveParameterIndex.getMarshalledSize();
-   marshalSize += 1;  // propulsionPlantConfiguration
-   marshalSize += 1;  // numberOfShafts
-   marshalSize += 1;  // numberOfAPAs
-   marshalSize += 1;  // numberOfUAEmitterSystems
-   for(int idx=0; idx < shaftRPMs.size(); idx++)
-   {
-        ShaftRPM listElement = shaftRPMs.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < apaData.size(); idx++)
-   {
-        APA listElement = apaData.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-   for(int idx=0; idx < emitterSystems.size(); idx++)
-   {
-        UAEmitter listElement = emitterSystems.get(idx);
-        marshalSize += listElement.getMarshalledSize();
-   }
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link UnderwaterAcousticPdu#emittingEntityID}*/
-public UnderwaterAcousticPdu setEmittingEntityID(EntityID pEmittingEntityID)
-{
-    emittingEntityID = pEmittingEntityID;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#emittingEntityID}*/
-public EntityID getEmittingEntityID()
-{
-    return emittingEntityID; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#eventID}*/
-public UnderwaterAcousticPdu setEventID(EventIdentifier pEventID)
-{
-    eventID = pEventID;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#eventID}*/
-public EventIdentifier getEventID()
-{
-    return eventID; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#stateChangeIndicator}*/
-public UnderwaterAcousticPdu setStateChangeIndicator(UAStateChangeUpdateIndicator pStateChangeIndicator)
-{
-    stateChangeIndicator = pStateChangeIndicator;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#stateChangeIndicator}*/
-public UAStateChangeUpdateIndicator getStateChangeIndicator()
-{
-    return stateChangeIndicator; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#pad}*/
-public UnderwaterAcousticPdu setPad(byte pPad)
-{
-    pad = pPad;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#pad}*/
-public byte getPad()
-{
-    return pad; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#passiveParameterIndex}*/
-public UnderwaterAcousticPdu setPassiveParameterIndex(UAPassiveParameterIndex pPassiveParameterIndex)
-{
-    passiveParameterIndex = pPassiveParameterIndex;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#passiveParameterIndex}*/
-public UAPassiveParameterIndex getPassiveParameterIndex()
-{
-    return passiveParameterIndex; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#propulsionPlantConfiguration}*/
-public UnderwaterAcousticPdu setPropulsionPlantConfiguration(byte pPropulsionPlantConfiguration)
-{
-    propulsionPlantConfiguration = pPropulsionPlantConfiguration;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#propulsionPlantConfiguration}*/
-public byte getPropulsionPlantConfiguration()
-{
-    return propulsionPlantConfiguration; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#shaftRPMs}*/
-public UnderwaterAcousticPdu setShaftRPMs(List<ShaftRPM> pShaftRPMs)
-{
-    shaftRPMs = pShaftRPMs;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#shaftRPMs}*/
-public List<ShaftRPM> getShaftRPMs()
-{
-    return shaftRPMs; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#apaData}*/
-public UnderwaterAcousticPdu setApaData(List<APA> pApaData)
-{
-    apaData = pApaData;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#apaData}*/
-public List<APA> getApaData()
-{
-    return apaData; 
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#emitterSystems}*/
-public UnderwaterAcousticPdu setEmitterSystems(List<UAEmitter> pEmitterSystems)
-{
-    emitterSystems = pEmitterSystems;
-    return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#emitterSystems}*/
-public List<UAEmitter> getEmitterSystems()
-{
-    return emitterSystems; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-       emittingEntityID.marshal(dos);
-       eventID.marshal(dos);
-       stateChangeIndicator.marshal(dos);
-       dos.writeByte(pad);
-       passiveParameterIndex.marshal(dos);
-       dos.writeByte(propulsionPlantConfiguration);
-       dos.writeByte(shaftRPMs.size());
-       dos.writeByte(apaData.size());
-       dos.writeByte(emitterSystems.size());
-
-       for(int idx = 0; idx < shaftRPMs.size(); idx++)
-       {
-            ShaftRPM aShaftRPM = shaftRPMs.get(idx);
-            aShaftRPM.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < apaData.size(); idx++)
-       {
-            APA aAPA = apaData.get(idx);
-            aAPA.marshal(dos);
-       }
-
-
-       for(int idx = 0; idx < emitterSystems.size(); idx++)
-       {
-            UAEmitter aUAEmitter = emitterSystems.get(idx);
-            aUAEmitter.marshal(dos);
-       }
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-        uPosition += emittingEntityID.unmarshal(dis);
-        uPosition += eventID.unmarshal(dis);
-        stateChangeIndicator = UAStateChangeUpdateIndicator.unmarshalEnum(dis);
-        uPosition += stateChangeIndicator.getMarshalledSize();
-        pad = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        passiveParameterIndex = UAPassiveParameterIndex.unmarshalEnum(dis);
-        uPosition += passiveParameterIndex.getMarshalledSize();
-        propulsionPlantConfiguration = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfShafts = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfAPAs = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        numberOfUAEmitterSystems = (byte)dis.readUnsignedByte();
-        uPosition += 1;
-        for(int idx = 0; idx < numberOfShafts; idx++)
-        {
-            ShaftRPM anX = new ShaftRPM();
-            uPosition += anX.unmarshal(dis);
-            shaftRPMs.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfAPAs; idx++)
-        {
-            APA anX = new APA();
-            uPosition += anX.unmarshal(dis);
-            apaData.add(anX);
-        }
-
-        for(int idx = 0; idx < numberOfUAEmitterSystems; idx++)
-        {
-            UAEmitter anX = new UAEmitter();
-            uPosition += anX.unmarshal(dis);
-            emitterSystems.add(anX);
-        }
-
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-   emittingEntityID.marshal(buff);
-   eventID.marshal(buff);
-   stateChangeIndicator.marshal(buff);
-   buff.put( (byte)pad);
-   passiveParameterIndex.marshal(buff);
-   buff.put( (byte)propulsionPlantConfiguration);
-   buff.put( (byte)shaftRPMs.size());
-   buff.put( (byte)apaData.size());
-   buff.put( (byte)emitterSystems.size());
-
-   for(int idx = 0; idx < shaftRPMs.size(); idx++)
-   {
-        ShaftRPM aShaftRPM = shaftRPMs.get(idx);
-        aShaftRPM.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < apaData.size(); idx++)
-   {
-        APA aAPA = apaData.get(idx);
-        aAPA.marshal(buff);
-   }
-
-
-   for(int idx = 0; idx < emitterSystems.size(); idx++)
-   {
-        UAEmitter aUAEmitter = emitterSystems.get(idx);
-        aUAEmitter.marshal(buff);
-   }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    emittingEntityID.unmarshal(buff);
-    eventID.unmarshal(buff);
-    stateChangeIndicator = UAStateChangeUpdateIndicator.unmarshalEnum(buff);
-    pad = (byte)(buff.get() & 0xFF);
-    passiveParameterIndex = UAPassiveParameterIndex.unmarshalEnum(buff);
-    propulsionPlantConfiguration = (byte)(buff.get() & 0xFF);
-    numberOfShafts = (byte)(buff.get() & 0xFF);
-    numberOfAPAs = (byte)(buff.get() & 0xFF);
-    numberOfUAEmitterSystems = (byte)(buff.get() & 0xFF);
-    for(int idx = 0; idx < numberOfShafts; idx++)
-    {
-    ShaftRPM anX = new ShaftRPM();
-    anX.unmarshal(buff);
-    shaftRPMs.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfAPAs; idx++)
-    {
-    APA anX = new APA();
-    anX.unmarshal(buff);
-    apaData.add(anX);
-    }
-
-    for(int idx = 0; idx < numberOfUAEmitterSystems; idx++)
-    {
-    UAEmitter anX = new UAEmitter();
-    anX.unmarshal(buff);
-    emitterSystems.add(anX);
-    }
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final UnderwaterAcousticPdu rhs = (UnderwaterAcousticPdu)obj;
-
-     if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
-     if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
-     if( ! (stateChangeIndicator == rhs.stateChangeIndicator)) ivarsEqual = false;
-     if( ! (pad == rhs.pad)) ivarsEqual = false;
-     if( ! (passiveParameterIndex == rhs.passiveParameterIndex)) ivarsEqual = false;
-     if( ! (propulsionPlantConfiguration == rhs.propulsionPlantConfiguration)) ivarsEqual = false;
-
-     for(int idx = 0; idx < shaftRPMs.size(); idx++)
-        if( ! ( shaftRPMs.get(idx).equals(rhs.shaftRPMs.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < apaData.size(); idx++)
-        if( ! ( apaData.get(idx).equals(rhs.apaData.get(idx)))) ivarsEqual = false;
-
-
-     for(int idx = 0; idx < emitterSystems.size(); idx++)
-        if( ! ( emitterSystems.get(idx).equals(rhs.emitterSystems.get(idx)))) ivarsEqual = false;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
-    sb.append(" eventID: ").append(eventID).append("\n");
-    sb.append(" stateChangeIndicator: ").append(stateChangeIndicator).append("\n");
-    sb.append(" pad: ").append(pad).append("\n");
-    sb.append(" passiveParameterIndex: ").append(passiveParameterIndex).append("\n");
-    sb.append(" propulsionPlantConfiguration: ").append(propulsionPlantConfiguration).append("\n");
-    sb.append(" shaftRPMs: ").append("\n");
-    shaftRPMs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" apaData: ").append("\n");
-    apaData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-    sb.append(" emitterSystems: ").append("\n");
-    emitterSystems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
deleted file mode 100644
index aaf9a831ec89b108cdff53c18f181a7335f3d948..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * container class not in specification
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class UnsignedDISInteger extends Object implements Serializable
-{
-   /** unsigned integer */
-   protected int  val;
-
-
-/** Constructor */
- public UnsignedDISInteger()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // val
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link UnsignedDISInteger#val}*/
-public UnsignedDISInteger setVal(int pVal)
-{
-    val = pVal;
-    return this;
-}
-
-/** Getter for {@link UnsignedDISInteger#val}*/
-public int getVal()
-{
-    return val; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeInt(val);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        val = dis.readInt();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putInt( (int)val);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    val = buff.getInt();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final UnsignedDISInteger rhs = (UnsignedDISInteger)obj;
-
-     if( ! (val == rhs.val)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" val: ").append(val).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VariableDatum.java b/src-generated/edu/nps/moves/dis7/VariableDatum.java
deleted file mode 100644
index 53bd4300b203d8a63666ee7b74653a57bb18b1de..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/VariableDatum.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-package edu.nps.moves.dis7;
-
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * the variable datum type, the datum length, and the value for that variable datum type. Section 6.2.93
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class VariableDatum extends Object implements Serializable
-{
-  /**
-   * Type of variable datum to be transmitted. 32 bit enumeration defined in EBV uid 66
-   */
-  protected VariableRecordType variableDatumID = VariableRecordType.values()[0];
-
-  /**
-   * Length, IN BITS, of the variable datum.
-   */
-  protected Integer variableDatumLength;
-
-  /**
-   * This field shall specify the value for a particular Variable Datum ID. The
-   * field format shall depend on the type of datum as specified by the Variable Datum ID. Variable
-   * datums can be any number of bits long.
-   */
-  protected byte[] variableDatumValue = new byte[0];
-
-  private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-  public int getMarshalledSize()
-  {
-    int marshalSize = 0;
-
-    marshalSize += variableDatumID.getMarshalledSize();
-    marshalSize += 4;  // variableDatumLength
-    marshalSize += variableDatumValue.length;
-    marshalSize += padding.length;
-
-    return marshalSize;
-  }
-
-  /**
-   * Setter for {@link VariableDatum#variableDatumID}
-   *
-   * @param pVariableDatumID
-   * @return this object
-   */
-  public VariableDatum setVariableDatumID(VariableRecordType pVariableDatumID)
-  {
-    variableDatumID = pVariableDatumID;
-    return this;
-  }
-
-  /**
-   * Getter for {@link VariableDatum#variableDatumID}
-   *
-   * @return value of field
-   */
-  public VariableRecordType getVariableDatumID()
-  {
-    return variableDatumID;
-  }
-
-  /**
-   * Setter for {@link VariableDatum#variableDatumLength}
-   * <p>
-   * This value is the size IN BITS of the {@link VariableDatum#variableDatumValue} field. Since that field
-   * is a byte array, its size must be large enough to contain the specified number of bits. If
-   * {@link VariableDatum#variableDatumValue} is NOT
-   * set and this pdu is issued (marshaled), the value used when marshaling this field will be
-   * the size of the byte array times 8.
-   * @param bitLength
-   * @return 
-   */
-  public VariableDatum setVariableDatumLengthInBits(int bitLength)
-  {
-    variableDatumLength = bitLength;
-    return this;
-  }
-
- /**
-   * Setter for {@link VariableDatum#variableDatumLength}
-   * <p>
-   * This value is the size in bytes of the {@link VariableDatum#variableDatumValue} field. Since that field
-   * is a byte array, its size must be large enough to contain the value specified here. If
-   * {@link VariableDatum#variableDatumValue} is NOT
-   * set and this pdu is issued (marshaled), the value used when marshaling this field will be
-   * the size of the byte array times 8.
-   * @param byteLength
-   * @return 
-   */
-  public VariableDatum setVariableDatumLengthInBytes(int byteLength)
-  {
-    variableDatumLength = byteLength * Byte.SIZE;
-    return this;
-  }
-  
-  /**
-   * Getter for {@link VariableDatum#variableDatumLength}
-   * @return 
-   */
-  public int getVariableDatumLength()
-  {
-    return variableDatumLength;
-  }
-
-  /**
-   * Setter for {@link VariableDatum#variableDatumValue}
-   * <p>
-   * This is described in the specification as a stream of bits, but is implemented in Java as a byte array.
-   * The size of the byte array reflects the value of {@link VariableDatum#variableDatumLength} rounded to the next
-   * highest byte boundary. If {@link VariableDatum#variableDatumLength} is not set when the Pdu is sent, the
-   * receiver will read a bit length equal to the size of the byte array times 8.
-   * @param pVariableDatumValue
-   * @return this object
-   */
-  public VariableDatum setVariableDatumValue(byte[] pVariableDatumValue)
-  {
-    variableDatumValue = pVariableDatumValue;
-    return this;
-  }
-
-  /**
-   * Getter for {@link VariableDatum#variableDatumValue}
-   * @return 
-   */
-  public byte[] getVariableDatumValue()
-  {
-    return variableDatumValue;
-  }
-
-  /* *************************** */
-  /* Marshal / unmarshal methods */
-  /* *************************** */
-  
-  /**
-   * Serializes an object to a DataOutputStream.
-   *
-   * @throws java.lang.Exception
-   * @see java.io.DataOutputStream
-   * @param dos The DataOutputStream
-   */
-  public void marshal(DataOutputStream dos) throws Exception
-  {
-    try {
-      variableDatumID.marshal(dos);
-      if (variableDatumLength != null)
-        dos.writeInt(variableDatumLength);
-      else
-        dos.writeInt(variableDatumLength = calculateDatumLength());
-
-      for (int idx = 0; idx < variableDatumValue.length; idx++) {
-        dos.writeByte(variableDatumValue[idx]);
-      }
-
-      padding = new byte[Align.to64bits(dos)];
-    }
-    catch (IOException e) {
-      System.err.println(e);
-    }
-  }
-
-  /**
-   * Unserializes an object from a DataInputStream.
-   *
-   * @throws java.lang.Exception
-   * @see java.io.DataInputStream
-   * @param dis The DataInputStream
-   * @return marshalled size
-   */
-  public int unmarshal(DataInputStream dis) throws Exception
-  {
-    int uPosition = 0;
-    try {
-      variableDatumID = VariableRecordType.unmarshalEnum(dis);
-      uPosition += variableDatumID.getMarshalledSize();
-      variableDatumLength = dis.readInt();
-      int byteLength = (variableDatumLength + 7) / 8;
-      variableDatumValue = new byte[byteLength];
-      uPosition += 4;
-      for (int idx = 0; idx < byteLength; idx++) {
-        variableDatumValue[idx] = dis.readByte();
-      }
-      uPosition += variableDatumLength;
-      padding = new byte[Align.from64bits(uPosition, dis)];
-      //uPosition += padding.length;
-    }
-    catch (Exception e) {
-      System.out.println(e);
-    }
-    return getMarshalledSize();
-  }
-
-  /**
-   * Packs an object into the ByteBuffer.
-   *
-   * @throws java.nio.BufferOverflowException if buff is too small
-   * @throws java.nio.ReadOnlyBufferException if buff is read only
-   * @see java.nio.ByteBuffer
-   * @param buff The ByteBuffer at the position to begin writing
-   * @throws Exception ByteBuffer-generated exception
-   */
-  public void marshal(java.nio.ByteBuffer buff) throws Exception
-  {
-    variableDatumID.marshal(buff);
-
-    if (variableDatumLength != null)
-      buff.putInt(variableDatumLength);
-    else
-      buff.putInt(variableDatumLength = calculateDatumLength());
-    for (int idx = 0; idx < variableDatumLength; idx++) //for(int idx = 0; idx < variableDatumValue.length; idx++)
-    {
-      buff.put(variableDatumValue[idx]);
-    }
-    padding = new byte[Align.to64bits(buff)];
-  }
-
-  /**
-   * Unpacks a Pdu from the underlying data.
-   *
-   * @throws java.nio.BufferUnderflowException if buff is too small
-   * @see java.nio.ByteBuffer
-   * @param buff The ByteBuffer at the position to begin reading
-   * @return marshalled size
-   * @throws Exception ByteBuffer-generated exception
-   */
-  public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-  {
-    variableDatumID = VariableRecordType.unmarshalEnum(buff);
-    variableDatumLength = buff.getInt();
-    int byteLength = (variableDatumLength + 7) / 8;
-    variableDatumValue = new byte[byteLength];
-    for (int idx = 0; idx < byteLength; idx++) {
-      variableDatumValue[idx] = buff.get();
-    }
-    padding = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-  }
-
-  private int calculateDatumLength()
-  {
-    return variableDatumValue.length * 8;
-  }
-
-  /*
-  * The equals method doesn't always work--mostly it works only on classes that consist only of primitives. Be careful.
-   */
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (this == obj)
-      return true;
-
-    if (obj == null)
-      return false;
-
-    if (getClass() != obj.getClass())
-      return false;
-
-    return equalsImpl(obj);
-  }
-
-  /**
-   * Compare all fields that contribute to the state, ignoring
-   * transient and static fields, for <code>this</code> and the supplied object
-   *
-   * @param obj the object to compare to
-   * @return true if the objects are equal, false otherwise.
-   */
-  public boolean equalsImpl(Object obj)
-  {
-    boolean ivarsEqual = true;
-
-    if (!(obj instanceof VariableDatum))
-      return false;
-
-    final VariableDatum rhs = (VariableDatum) obj;
-
-    if (!(variableDatumID == rhs.variableDatumID))
-      ivarsEqual = false;
-    if (!(variableDatumLength.equals(rhs.variableDatumLength)))
-      ivarsEqual = false;
-    for (int idx = 0; idx < 0; idx++) {
-      if (!(variableDatumValue[idx] == rhs.variableDatumValue[idx]))
-        ivarsEqual = false;
-    }
-    return ivarsEqual;
-  }
-}
diff --git a/src-generated/edu/nps/moves/dis7/VariableParameter.java b/src-generated/edu/nps/moves/dis7/VariableParameter.java
deleted file mode 100644
index 4d69a1c6ff5cbc70f97a25a5202463473683cc0c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/VariableParameter.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * used in DetonationPdu, ArticulatedPartsPdu among others
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class VariableParameter extends Object implements Serializable
-{
-   /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
-   protected VariableParameterRecordType recordType = VariableParameterRecordType.values()[0];
-
-   /** 120 bits */
-   protected byte[]  recordSpecificFields = new byte[15]; 
-
-
-/** Constructor */
- public VariableParameter()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += recordSpecificFields.length * 1;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link VariableParameter#recordType}*/
-public VariableParameter setRecordType(VariableParameterRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link VariableParameter#recordType}*/
-public VariableParameterRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link VariableParameter#recordSpecificFields}*/
-public VariableParameter setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
-    recordSpecificFields = Arrays.copyOf(pRecordSpecificFields, recordSpecificFields.length);
-    return this;
-}
-
-/** Getter for {@link VariableParameter#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
-{
-    return recordSpecificFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-
-       for(int idx = 0; idx < recordSpecificFields.length; idx++)
-           dos.writeByte(recordSpecificFields[idx]);
-
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableParameterRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        for(int idx = 0; idx < recordSpecificFields.length; idx++)
-            recordSpecificFields[idx] = dis.readByte();
-        uPosition += (recordSpecificFields.length * 1);
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-
-   for(int idx = 0; idx < recordSpecificFields.length; idx++)
-       buff.put((byte)recordSpecificFields[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableParameterRecordType.unmarshalEnum(buff);
-    for(int idx = 0; idx < recordSpecificFields.length; idx++)
-        recordSpecificFields[idx] = buff.get();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final VariableParameter rhs = (VariableParameter)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 15; idx++)
-     {
-          if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordSpecificFields: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
deleted file mode 100644
index 6b43745f170bc38fec5585edd28960151069a698..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Relates to radios. Section 6.2.95
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class VariableTransmitterParameters extends Object implements Serializable
-{
-   /** Type of VTP uid 66 */
-   protected VariableRecordType recordType = VariableRecordType.values()[0];
-
-   /** Length, in bytes */
-   protected short  recordLength;
-
-   protected byte[]  recordSpecificFields = new byte[0]; 
-
-   private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public VariableTransmitterParameters()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += recordType.getMarshalledSize();
-   marshalSize += 2;  // recordLength
-   marshalSize += recordSpecificFields.length * 1;
-   marshalSize += padding.length;
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link VariableTransmitterParameters#recordType}*/
-public VariableTransmitterParameters setRecordType(VariableRecordType pRecordType)
-{
-    recordType = pRecordType;
-    return this;
-}
-
-/** Getter for {@link VariableTransmitterParameters#recordType}*/
-public VariableRecordType getRecordType()
-{
-    return recordType; 
-}
-
-/** Setter for {@link VariableTransmitterParameters#recordLength}*/
-public VariableTransmitterParameters setRecordLength(short pRecordLength)
-{
-    recordLength = pRecordLength;
-    return this;
-}
-
-/** Getter for {@link VariableTransmitterParameters#recordLength}*/
-public short getRecordLength()
-{
-    return recordLength; 
-}
-
-/** Setter for {@link VariableTransmitterParameters#recordSpecificFields}*/
-public VariableTransmitterParameters setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
-    recordSpecificFields = pRecordSpecificFields;
-    return this;
-}
-
-/** Getter for {@link VariableTransmitterParameters#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
-{
-    return recordSpecificFields; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       recordType.marshal(dos);
-       dos.writeShort(recordLength);
-
-       for(int idx = 0; idx < recordSpecificFields.length; idx++)
-           dos.writeByte(recordSpecificFields[idx]);
-
-       padding = new byte[Align.to64bits(dos)];
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        recordType = VariableRecordType.unmarshalEnum(dis);
-        uPosition += recordType.getMarshalledSize();
-        recordLength = (short)dis.readUnsignedShort();
-        uPosition += 2;
-        for(int idx = 0; idx < recordSpecificFields.length; idx++)
-            recordSpecificFields[idx] = dis.readByte();
-        uPosition += (recordSpecificFields.length * 1);
-        padding = new byte[Align.from64bits(uPosition,dis)];
-        uPosition += padding.length;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   recordType.marshal(buff);
-   buff.putShort( (short)recordLength);
-
-   for(int idx = 0; idx < recordSpecificFields.length; idx++)
-       buff.put((byte)recordSpecificFields[idx]);
-
-   padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    recordType = VariableRecordType.unmarshalEnum(buff);
-    recordLength = (short)(buff.getShort() & 0xFFFF);
-    for(int idx = 0; idx < recordSpecificFields.length; idx++)
-        recordSpecificFields[idx] = buff.get();
-    padding = new byte[Align.from64bits(buff)];
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final VariableTransmitterParameters rhs = (VariableTransmitterParameters)obj;
-
-     if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-     if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-
-     for(int idx = 0; idx < 0; idx++)
-     {
-          if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
-     }
-
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" recordType: ").append(recordType).append("\n");
-    sb.append(" recordLength: ").append(recordLength).append("\n");
-    sb.append(" recordSpecificFields: ").append("\n");
-    sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-    sb.append(" padding: ").append(padding).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector2Float.java b/src-generated/edu/nps/moves/dis7/Vector2Float.java
deleted file mode 100644
index becee085c8e2937d2086c48e0ccf699a0abc01df..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Vector2Float.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Two floating point values, x, y
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Vector2Float extends Object implements Serializable
-{
-   /** X value */
-   protected float  x;
-
-   /** y Value */
-   protected float  y;
-
-
-/** Constructor */
- public Vector2Float()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // x
-   marshalSize += 4;  // y
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Vector2Float#x}*/
-public Vector2Float setX(float pX)
-{
-    x = pX;
-    return this;
-}
-
-/** Getter for {@link Vector2Float#x}*/
-public float getX()
-{
-    return x; 
-}
-
-/** Setter for {@link Vector2Float#y}*/
-public Vector2Float setY(float pY)
-{
-    y = pY;
-    return this;
-}
-
-/** Getter for {@link Vector2Float#y}*/
-public float getY()
-{
-    return y; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(x);
-       dos.writeFloat(y);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        x = dis.readFloat();
-        uPosition += 4;
-        y = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)x);
-   buff.putFloat( (float)y);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    x = buff.getFloat();
-    y = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Vector2Float rhs = (Vector2Float)obj;
-
-     if( ! (x == rhs.x)) ivarsEqual = false;
-     if( ! (y == rhs.y)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" x: ").append(x).append("\n");
-    sb.append(" y: ").append(y).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Double.java b/src-generated/edu/nps/moves/dis7/Vector3Double.java
deleted file mode 100644
index 1c7f9eb9506f7476bc1a92311b9e66f6ae5d5651..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Vector3Double.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Vector3Double extends Object implements Serializable
-{
-   /** X value */
-   protected double  x;
-
-   /** y Value */
-   protected double  y;
-
-   /** Z value */
-   protected double  z;
-
-
-/** Constructor */
- public Vector3Double()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 8;  // x
-   marshalSize += 8;  // y
-   marshalSize += 8;  // z
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Vector3Double#x}*/
-public Vector3Double setX(double pX)
-{
-    x = pX;
-    return this;
-}
-
-/** Getter for {@link Vector3Double#x}*/
-public double getX()
-{
-    return x; 
-}
-
-/** Setter for {@link Vector3Double#y}*/
-public Vector3Double setY(double pY)
-{
-    y = pY;
-    return this;
-}
-
-/** Getter for {@link Vector3Double#y}*/
-public double getY()
-{
-    return y; 
-}
-
-/** Setter for {@link Vector3Double#z}*/
-public Vector3Double setZ(double pZ)
-{
-    z = pZ;
-    return this;
-}
-
-/** Getter for {@link Vector3Double#z}*/
-public double getZ()
-{
-    return z; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeDouble(x);
-       dos.writeDouble(y);
-       dos.writeDouble(z);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        x = dis.readDouble();
-        uPosition += 4;
-        y = dis.readDouble();
-        uPosition += 4;
-        z = dis.readDouble();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putDouble( (double)x);
-   buff.putDouble( (double)y);
-   buff.putDouble( (double)z);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    x = buff.getDouble();
-    y = buff.getDouble();
-    z = buff.getDouble();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Vector3Double rhs = (Vector3Double)obj;
-
-     if( ! (x == rhs.x)) ivarsEqual = false;
-     if( ! (y == rhs.y)) ivarsEqual = false;
-     if( ! (z == rhs.z)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" x: ").append(x).append("\n");
-    sb.append(" y: ").append(y).append("\n");
-    sb.append(" z: ").append(z).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Float.java b/src-generated/edu/nps/moves/dis7/Vector3Float.java
deleted file mode 100644
index b7e0fbe39e6f607a68434e36fe1b8df3f965eff0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/Vector3Float.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Three floating point values, x, y, and z. Section 6.2.95
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class Vector3Float extends Object implements Serializable
-{
-   /** X value */
-   protected float  x;
-
-   /** y Value */
-   protected float  y;
-
-   /** Z value */
-   protected float  z;
-
-
-/** Constructor */
- public Vector3Float()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // x
-   marshalSize += 4;  // y
-   marshalSize += 4;  // z
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link Vector3Float#x}*/
-public Vector3Float setX(float pX)
-{
-    x = pX;
-    return this;
-}
-
-/** Getter for {@link Vector3Float#x}*/
-public float getX()
-{
-    return x; 
-}
-
-/** Setter for {@link Vector3Float#y}*/
-public Vector3Float setY(float pY)
-{
-    y = pY;
-    return this;
-}
-
-/** Getter for {@link Vector3Float#y}*/
-public float getY()
-{
-    return y; 
-}
-
-/** Setter for {@link Vector3Float#z}*/
-public Vector3Float setZ(float pZ)
-{
-    z = pZ;
-    return this;
-}
-
-/** Getter for {@link Vector3Float#z}*/
-public float getZ()
-{
-    return z; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(x);
-       dos.writeFloat(y);
-       dos.writeFloat(z);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        x = dis.readFloat();
-        uPosition += 4;
-        y = dis.readFloat();
-        uPosition += 4;
-        z = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)x);
-   buff.putFloat( (float)y);
-   buff.putFloat( (float)z);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    x = buff.getFloat();
-    y = buff.getFloat();
-    z = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final Vector3Float rhs = (Vector3Float)obj;
-
-     if( ! (x == rhs.x)) ivarsEqual = false;
-     if( ! (y == rhs.y)) ivarsEqual = false;
-     if( ! (z == rhs.z)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" x: ").append(x).append("\n");
-    sb.append(" y: ").append(y).append("\n");
-    sb.append(" z: ").append(z).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
deleted file mode 100644
index cc24a6ddb8b62ddacb23c02b2d80f8046b54916d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Operational data for describing the vectoring nozzle systems Section 6.2.96
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public class VectoringNozzleSystem extends Object implements Serializable
-{
-   /** In degrees */
-   protected float  horizontalDeflectionAngle;
-
-   /** In degrees */
-   protected float  verticalDeflectionAngle;
-
-
-/** Constructor */
- public VectoringNozzleSystem()
- {
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize += 4;  // horizontalDeflectionAngle
-   marshalSize += 4;  // verticalDeflectionAngle
-
-   return marshalSize;
-}
-
-
-/** Setter for {@link VectoringNozzleSystem#horizontalDeflectionAngle}*/
-public VectoringNozzleSystem setHorizontalDeflectionAngle(float pHorizontalDeflectionAngle)
-{
-    horizontalDeflectionAngle = pHorizontalDeflectionAngle;
-    return this;
-}
-
-/** Getter for {@link VectoringNozzleSystem#horizontalDeflectionAngle}*/
-public float getHorizontalDeflectionAngle()
-{
-    return horizontalDeflectionAngle; 
-}
-
-/** Setter for {@link VectoringNozzleSystem#verticalDeflectionAngle}*/
-public VectoringNozzleSystem setVerticalDeflectionAngle(float pVerticalDeflectionAngle)
-{
-    verticalDeflectionAngle = pVerticalDeflectionAngle;
-    return this;
-}
-
-/** Getter for {@link VectoringNozzleSystem#verticalDeflectionAngle}*/
-public float getVerticalDeflectionAngle()
-{
-    return verticalDeflectionAngle; 
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    try 
-    {
-       dos.writeFloat(horizontalDeflectionAngle);
-       dos.writeFloat(verticalDeflectionAngle);
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    try 
-    {
-        horizontalDeflectionAngle = dis.readFloat();
-        uPosition += 4;
-        verticalDeflectionAngle = dis.readFloat();
-        uPosition += 4;
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   buff.putFloat( (float)horizontalDeflectionAngle);
-   buff.putFloat( (float)verticalDeflectionAngle);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    horizontalDeflectionAngle = buff.getFloat();
-    verticalDeflectionAngle = buff.getFloat();
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
- /**
-  * Compare all fields that contribute to the state, ignoring
-  * transient and static fields, for <code>this</code> and the supplied object
-  * @param obj the object to compare to
-  * @return true if the objects are equal, false otherwise.
-  */
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final VectoringNozzleSystem rhs = (VectoringNozzleSystem)obj;
-
-     if( ! (horizontalDeflectionAngle == rhs.horizontalDeflectionAngle)) ivarsEqual = false;
-     if( ! (verticalDeflectionAngle == rhs.verticalDeflectionAngle)) ivarsEqual = false;
-    return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-    sb.append(" horizontalDeflectionAngle: ").append(horizontalDeflectionAngle).append("\n");
-    sb.append(" verticalDeflectionAngle: ").append(verticalDeflectionAngle).append("\n");
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
deleted file mode 100644
index 5771955367f17c5e323f88548d76fc9fb402e46e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Abstract superclass for fire and detonation pdus that have shared information. Section 7.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
- */
-public abstract class WarfareFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public WarfareFamilyPdu()
- {
-    setProtocolFamily( DISProtocolFamily.WARFARE );
- }
-
-  /**
-   * Returns size of this serialized object in bytes
-   * @return size in bytes
-   */
-public int getMarshalledSize()
-{
-   int marshalSize = 0; 
-
-   marshalSize = super.getMarshalledSize();
-
-   return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
-    super.marshal(dos);
-    try 
-    {
-    }
-    catch(Exception e)
-    {
-      System.err.println(e);
-    }
-}
-
-/**
- * Deserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
-    int uPosition = 0;
-    uPosition += super.unmarshal(dis);
-
-    try 
-    {
-    }
-    catch(Exception e)
-    { 
-      System.err.println(e); 
-    }
-    return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-   super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
-    super.unmarshal(buff);
-
-    return getMarshalledSize();
-}
-
- /*
-  * Override of default equals method.  Calls equalsImpl() for content comparison.
-  */
-@Override
- public boolean equals(Object obj)
- {
-    if(this == obj)
-      return true;
-
-    if(obj == null)
-       return false;
-
-    if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
-        return false;
-
-    return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
-     boolean ivarsEqual = true;
-
-     final WarfareFamilyPdu rhs = (WarfareFamilyPdu)obj;
-
-    return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
-    StringBuilder sb = new StringBuilder();
-    sb.append(getClass().getSimpleName()).append(":\n");
-
-
-   return sb.toString();
- }
-} // end of class
diff --git a/src/edu/nps/moves/dis7/examples/AlphabeticalPduSender.java b/src/edu/nps/moves/dis7/examples/AlphabeticalPduSender.java
index 3f4f84e84a313c764385e03a9b20aed7e04a2ac2..985b1da260df51360829042cb98cded54b076fa8 100644
--- a/src/edu/nps/moves/dis7/examples/AlphabeticalPduSender.java
+++ b/src/edu/nps/moves/dis7/examples/AlphabeticalPduSender.java
@@ -1,6 +1,6 @@
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 
diff --git a/src/edu/nps/moves/dis7/examples/ClassNameComparator.java b/src/edu/nps/moves/dis7/examples/ClassNameComparator.java
index 6c8bf0a12f11acd21d8c1fec112c50a800d0ad60..72bf58e691336ccc304ad1aeb5b5895cff6924fd 100644
--- a/src/edu/nps/moves/dis7/examples/ClassNameComparator.java
+++ b/src/edu/nps/moves/dis7/examples/ClassNameComparator.java
@@ -5,7 +5,7 @@
 
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import java.util.Comparator;
 
 /**
diff --git a/src/edu/nps/moves/dis7/examples/EntityStateEntityIdExampleUse.java b/src/edu/nps/moves/dis7/examples/EntityStateEntityIdExampleUse.java
index 4639774c072e2a3f4e25174042611796b821ca4c..dea7082411276f4ae38145fc3de485977540e203 100644
--- a/src/edu/nps/moves/dis7/examples/EntityStateEntityIdExampleUse.java
+++ b/src/edu/nps/moves/dis7/examples/EntityStateEntityIdExampleUse.java
@@ -5,8 +5,8 @@
 
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.EntityStatePdu;
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
diff --git a/src/edu/nps/moves/dis7/examples/EspduReceiver.java b/src/edu/nps/moves/dis7/examples/EspduReceiver.java
index e2c03448697e3a1c5029772c231f627fac2e4983..ec05a3ad1d992c161f3d5a0a84bc5c7a4d60fdc1 100644
--- a/src/edu/nps/moves/dis7/examples/EspduReceiver.java
+++ b/src/edu/nps/moves/dis7/examples/EspduReceiver.java
@@ -4,10 +4,10 @@
  */
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.EntityID;
-import edu.nps.moves.dis7.EntityStatePdu;
-import edu.nps.moves.dis7.Pdu;
-import edu.nps.moves.dis7.Vector3Double;
+import edu.nps.moves.dis7.pdus.EntityID;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.Vector3Double;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import java.io.IOException;
diff --git a/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java b/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java
index 5bcd202a70d278730ff259746071d427792cc8d2..a605572f4cdea3b66a86a8a07fc81d5e22eb13ff 100644
--- a/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java
+++ b/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java
@@ -4,7 +4,7 @@
  */
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import java.io.IOException;
diff --git a/src/edu/nps/moves/dis7/examples/EspduSender.java b/src/edu/nps/moves/dis7/examples/EspduSender.java
index 1faa4615b52b8f2cc0f080d23e8cfecd4ed99ea2..2acf9530109cfb3e367d4b26e84ed4943f3eb216 100644
--- a/src/edu/nps/moves/dis7/examples/EspduSender.java
+++ b/src/edu/nps/moves/dis7/examples/EspduSender.java
@@ -5,7 +5,7 @@
 
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.utilities.CoordinateConversions;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import java.io.*;
diff --git a/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java b/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java
index 6acef73e8ac1e31a7983b8a4f7628b7e400359b2..9fbab2d8bfc8ce767eba88794b9fd81e0928ee4e 100644
--- a/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java
+++ b/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java
@@ -4,10 +4,10 @@
  */
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.EntityID;
-import edu.nps.moves.dis7.EntityStatePdu;
-import edu.nps.moves.dis7.EulerAngles;
-import edu.nps.moves.dis7.Vector3Double;
+import edu.nps.moves.dis7.pdus.EntityID;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.EulerAngles;
+import edu.nps.moves.dis7.pdus.Vector3Double;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
diff --git a/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java b/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java
index 4b5d9c1df6161dfad7bd42ec57b93ce437b47caa..b2b39751228e2a65af40d25318c4b0026c0dbe46 100644
--- a/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java
+++ b/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java
@@ -4,7 +4,7 @@
  */
 package edu.nps.moves.dis7.examples;
 
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.enumerations.Country;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
diff --git a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java
index dc9fc9ae423fe2523de4aa9c697bc807f1c64931..e623fbfb5952079a860dc29379e218aad14da601 100644
--- a/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java
+++ b/src/edu/nps/moves/dis7/utilities/DisThreadedNetworkInterface.java
@@ -4,8 +4,8 @@
  */
 package edu.nps.moves.dis7.utilities;
 
-import edu.nps.moves.dis7.Pdu;
-import edu.nps.moves.dis7.DisTime;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.DisTime;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
diff --git a/src/edu/nps/moves/dis7/utilities/PduFactory.java b/src/edu/nps/moves/dis7/utilities/PduFactory.java
index ffdf6b9f6c2a642a825c942668c3857d28aad2a0..94f78b977677cd1e04f2a9c5c4db20fc1effc748 100644
--- a/src/edu/nps/moves/dis7/utilities/PduFactory.java
+++ b/src/edu/nps/moves/dis7/utilities/PduFactory.java
@@ -5,7 +5,7 @@
 
 package edu.nps.moves.dis7.utilities;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/edu/nps/moves/dis7/utilities/TrialDisMulticastNetworkingDeprecated.java b/src/edu/nps/moves/dis7/utilities/TrialDisMulticastNetworkingDeprecated.java
index c0206f174d8c22708a7739dca8d28653dc7edef3..18d7f408252827d9957c15aecb4d77b934c26697 100644
--- a/src/edu/nps/moves/dis7/utilities/TrialDisMulticastNetworkingDeprecated.java
+++ b/src/edu/nps/moves/dis7/utilities/TrialDisMulticastNetworkingDeprecated.java
@@ -4,7 +4,7 @@
  */
 package edu.nps.moves.dis7.utilities;
 
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java
index b9b2d1db6a9d9522f0162d5ff7a051158cc18091..82e42815db745ea7fbd74cf6b1860bf77a6ae04b 100644
--- a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java
+++ b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java
@@ -1,7 +1,7 @@
 package edu.nps.moves.dis7.utilities.stream;
 
-import edu.nps.moves.dis7.EntityStatePdu;
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import java.nio.ByteBuffer;
diff --git a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java
index e55ee60d4d9f9e25b9b4bb62c7ec49db52456215..be34f521831c5ef823a4eff8534d933ee6bc7522 100644
--- a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java
+++ b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java
@@ -1,7 +1,7 @@
 package edu.nps.moves.dis7.utilities.stream;
 
-import edu.nps.moves.dis7.EntityStatePdu;
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.enumerations.DISPDUType;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import java.nio.ByteBuffer;
diff --git a/test/edu/nps/moves/dis7/AllPduRoundTripTest.java b/test/edu/nps/moves/dis7/AllPduRoundTripTest.java
index 72ae4f59e0c65ca486b8be5824cd03088c70f107..2ca25f27a392145281a749ebece7a47e13c1c2eb 100644
--- a/test/edu/nps/moves/dis7/AllPduRoundTripTest.java
+++ b/test/edu/nps/moves/dis7/AllPduRoundTripTest.java
@@ -17,6 +17,7 @@ package edu.nps.moves.dis7;
  * @version $Id$
  */
 import edu.nps.moves.dis7.enumerations.Country;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import edu.nps.moves.dis7.utilities.stream.PduPlayer;
diff --git a/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java b/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java
index 7049dc40a7d281ff1f943efbcb283cb9ea945e21..2978c5dcc7ec898130884c5bd51f7a723d8258ed 100644
--- a/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java
+++ b/test/edu/nps/moves/dis7/BitFieldRoundTripTest.java
@@ -7,6 +7,11 @@ package edu.nps.moves.dis7;
 import edu.nps.moves.dis7.enumerations.AppearanceCamouflageType;
 import edu.nps.moves.dis7.enumerations.ForceID;
 import edu.nps.moves.dis7.enumerations.LandPlatformAppearance;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.EulerAngles;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.Vector3Double;
+import edu.nps.moves.dis7.pdus.Vector3Float;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import org.junit.jupiter.api.*;
@@ -101,8 +106,8 @@ public class BitFieldRoundTripTest
   private void dump(String s, EntityStatePdu espdu)
   {
     System.out.println(s);
-    System.out.println("Alternative EntityType: "+espdu.alternativeEntityType.toString());
-    System.out.println("Entity Capabilities: "+espdu.capabilities.toString());
+    System.out.println("Alternative EntityType: "+espdu.getAlternativeEntityType().toString());
+    System.out.println("Entity Capabilities: "+espdu.getCapabilities().toString());
     System.out.println("Dead Reckoning Parameters: "+ espdu.getDeadReckoningParameters().toString());
     System.out.println("Entity Appearance: "+ espdu.getEntityAppearance());
     System.out.println("Entity ID: "+ espdu.getEntityID().toString());
diff --git a/test/edu/nps/moves/dis7/CommentPdusTest.java b/test/edu/nps/moves/dis7/CommentPdusTest.java
index 3cb7083bde673088ea830849b03796c1ad8bc82d..c920ecee249d38de9891d4e9002fd7b5766867e0 100644
--- a/test/edu/nps/moves/dis7/CommentPdusTest.java
+++ b/test/edu/nps/moves/dis7/CommentPdusTest.java
@@ -5,6 +5,7 @@
 package edu.nps.moves.dis7;
 
 import edu.nps.moves.dis7.enumerations.VariableRecordType;
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import org.junit.jupiter.api.*;
diff --git a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java b/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java
index 9cbd01cd6bb77d8db2d489a83cdab0a06da3b8e8..03a5de581ff7f66ea646db709ca0379e401e3e56 100644
--- a/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java
+++ b/test/edu/nps/moves/dis7/CreateAllObjectTypesTest.java
@@ -4,6 +4,7 @@
  */
 package edu.nps.moves.dis7;
 
+import edu.nps.moves.dis7.pdus.ObjectType;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -43,213 +44,213 @@ public class CreateAllObjectTypesTest
     Throwable ex = null;
     try 
     {
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.ArealObject());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Obstacle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield.Minefield());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield.Hasty());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield.Prepared());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield.Scattered());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield.Solitary());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.LinearObject());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.Culturalfeature());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.TracksTire.TracksTire());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.Wire.Wire());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.Wire.WireCrush());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.Obstacle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ChainLinkFence.ChainLinkFence());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire.ConcertinaWire());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire._2Roll());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire._3Roll());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcreteBarrier.ConcreteBarrier());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.Rut.Rut());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.SpeedBump.SpeedBump());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.TankDitch.TankDitch());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.TankDitch.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach.Obstaclebreach());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach.Breach.Breach());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach.Breach.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.Obstaclemarker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.Obstaclemarker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.MinefieldLaneMarker.MinefieldLaneMarker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.MinefieldLaneMarker.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke.Tacticalsmoke());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke.ExhaustSmoke.ExhaustSmoke());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke.ExhaustSmoke.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke.Tacticalsmoke());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.PointObject());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Culturalfeature());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingRubble.BuildingRubble());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingRubble.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.BuildingStructure());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.ApartmentBuilding());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.Church());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.FOBGuardTower());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.FOBTrailerOffice());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.GovernmentBuilding());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.GuardHouse());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.Hanger());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.IndustrialBuilding());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.MicrowaveTower());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.PortaPotty());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.PowerPylon());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.RadioTower1000ft());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.RadioTower100ft());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.RadioTower500ft());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.RadioTVTower());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.School());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.TransformerYard());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingStructure.Windmill());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuilding());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingBridgeSingle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingFOB());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingHouseDouble());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingHouseSingle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingHouseSingleRailing());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingMosqueSingle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingStoreSingle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedEarth.DisturbedEarth());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoad());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoadAsphalt());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoadConcrete());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoadGravel());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.IndustrialProcessingPlant.IndustrialProcessingPlant());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.IndustrialProcessingPlant.OilRefinery());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuilding());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingApartment());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingChurch());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingControlTower());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingFarmHouse());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingFireStation());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingGasStation());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingHospital());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingHouse());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingMudbrickHouse());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingMudbrickStore());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingOfficeBuilding());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingPoliceStation());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingPowerStation());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingSchool());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingStore());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingWarehouse());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingWaterTower());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MaintenanceStructure.MaintenanceStructure());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MaintenanceStructure.LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MaintenanceStructure.LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MaintenanceStructure.LightweightMaintenanceEnclosureLMEBradley());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MaintenanceStructure.LightweightMaintenanceEnclosureLMEM1());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Pump.Pump());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Pump.PumpGas());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.Tent());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentArctic());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentBedouin());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentChemicallyandBiologicalProtectedShelterCBPS());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentExpandableFrame());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentFritsche());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentKuchi());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentLarge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentMedium());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentModularGeneralPurposeTentSystemMGPTS());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentSmall());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent.TentTEMPER());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduous());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduousLarge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduousMedium());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduousSmall());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreen());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreenLarge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreenMedium());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreenSmall());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.UtilityPole.UtilityPole());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject.EnvironmentalObject());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject.Flood.Flood());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject.Flood.FloodLarge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject.Flood.FloodMedium());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject.Flood.FloodSmall());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Obstacle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Abatis.Abatis());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Abatis.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Abatis._14Tree());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Abatis._8Tree());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.Barrier());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierConstruction());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierFenceChain6foot());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierFenceWood6foot());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketDoubleStacked());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketLarge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketMedium());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketSmall());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierJerseyPlastic());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.BarrierTexas());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier.DragonsTeeth());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Crater.Crater());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Crater.Large());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Crater.Medium());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Crater.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Crater.Small());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.LogCrib.LogCrib());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.LogCrib.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.LogCrib.Rectangular());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.LogCrib.Triangular());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.PotHole.PotHole());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.RockDrop.RockDrop());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.RockDrop.RockDropCovered());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.RockDrop.RockDropUncovered());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstaclemarker.Obstaclemarker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Obstaclemarker.NBCHazardMarker.NBCHazardMarker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.Passageway());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.AVLB.AVLB());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.AVLB.JointAssaultBridgeJAB());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.AVLB.M60A1());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.AVLB.MTU20());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.AVLB.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.Pier.Pier());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.RibbonBridge.RibbonBridge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.RibbonBridge.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.RibbonBridge._2Lane());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.RibbonBridge._4Lane());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.StationaryBridge.StationaryBridge());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.StationaryBridge.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.StationaryBridge._2Lane());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Passageway.StationaryBridge._4Lane());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.Preparedposition());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.CoveredMachineGunBunker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.HastyFightingPosition());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.InfantryFightingPosition());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.NonCoveredInfantryPosition());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.NonCoveredMachineGunBunker());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition.OverheadCoveredInfantryPosition());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade.ArmoredVehicle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade.FightingVehicle());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade.MortarCarrier());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade.Tank());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade.VehicleDefilade());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.Tacticalsmoke());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.AirBurst.AirBurst());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.AirBurst.Grenade());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.AirBurst.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.GroundBurst.GroundBurst());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.GroundBurst.Artillery());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.GroundBurst.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.Other.Other());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Green());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Red());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Violet());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Yellow());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M83White());
-      dumpObjectType(new edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.TacticalSmokeCanister());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.ArealObject());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Obstacle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Minefield.Minefield());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Minefield.Hasty());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Minefield.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Minefield.Prepared());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Minefield.Scattered());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Minefield.Solitary());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.ArealObject.Obstacle.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.LinearObject());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.Culturalfeature());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.TracksTire.TracksTire());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.Wire.Wire());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.Wire.WireCrush());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.Obstacle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ChainLinkFence.ChainLinkFence());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire.ConcertinaWire());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire._2Roll());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire._3Roll());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcreteBarrier.ConcreteBarrier());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.Rut.Rut());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.SpeedBump.SpeedBump());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.TankDitch.TankDitch());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.TankDitch.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclebreach.Obstaclebreach());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclebreach.Breach.Breach());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclebreach.Breach.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclebreach.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclemarker.Obstaclemarker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclemarker.Obstaclemarker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclemarker.MinefieldLaneMarker.MinefieldLaneMarker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclemarker.MinefieldLaneMarker.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Obstaclemarker.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Tacticalsmoke.Tacticalsmoke());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Tacticalsmoke.ExhaustSmoke.ExhaustSmoke());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Tacticalsmoke.ExhaustSmoke.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.LinearObject.Tacticalsmoke.Tacticalsmoke());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.PointObject());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Culturalfeature());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingRubble.BuildingRubble());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingRubble.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.BuildingStructure());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.ApartmentBuilding());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.Church());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.FOBGuardTower());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.FOBTrailerOffice());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.GovernmentBuilding());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.GuardHouse());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.Hanger());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.IndustrialBuilding());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.MicrowaveTower());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.PortaPotty());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.PowerPylon());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.RadioTower1000ft());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.RadioTower100ft());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.RadioTower500ft());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.RadioTVTower());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.School());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.TransformerYard());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.BuildingStructure.Windmill());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuilding());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingBridgeSingle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingFOB());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingHouseDouble());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingHouseSingle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingHouseSingleRailing());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingMosqueSingle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.ContainerBasedBuilding.ContainerBasedBuildingStoreSingle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.DisturbedEarth.DisturbedEarth());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoad());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoadAsphalt());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoadConcrete());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.DisturbedRoad.DisturbedRoadGravel());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.IndustrialProcessingPlant.IndustrialProcessingPlant());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.IndustrialProcessingPlant.OilRefinery());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuilding());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingApartment());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingChurch());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingControlTower());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingFarmHouse());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingFireStation());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingGasStation());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingHospital());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingHouse());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingMudbrickHouse());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingMudbrickStore());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingOfficeBuilding());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingPoliceStation());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingPowerStation());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingSchool());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingStore());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingWarehouse());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MOUTBuilding.MOUTBuildingWaterTower());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MaintenanceStructure.MaintenanceStructure());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MaintenanceStructure.LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MaintenanceStructure.LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MaintenanceStructure.LightweightMaintenanceEnclosureLMEBradley());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.MaintenanceStructure.LightweightMaintenanceEnclosureLMEM1());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Pump.Pump());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Pump.PumpGas());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.Tent());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentArctic());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentBedouin());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentChemicallyandBiologicalProtectedShelterCBPS());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentExpandableFrame());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentFritsche());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentKuchi());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentLarge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentMedium());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentModularGeneralPurposeTentSystemMGPTS());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentSmall());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.Tent.TentTEMPER());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduous());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduousLarge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduousMedium());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeDeciduous.TreeDeciduousSmall());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreen());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreenLarge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreenMedium());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.TreeEvergreen.TreeEvergreenSmall());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Culturalfeature.UtilityPole.UtilityPole());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.EnvironmentalObject.EnvironmentalObject());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.EnvironmentalObject.Flood.Flood());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.EnvironmentalObject.Flood.FloodLarge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.EnvironmentalObject.Flood.FloodMedium());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.EnvironmentalObject.Flood.FloodSmall());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Obstacle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Abatis.Abatis());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Abatis.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Abatis._14Tree());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Abatis._8Tree());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.Barrier());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierConstruction());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierFenceChain6foot());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierFenceWood6foot());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketDoubleStacked());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketLarge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketMedium());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierHESCOBasketSmall());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierJerseyPlastic());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.BarrierTexas());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Barrier.DragonsTeeth());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Crater.Crater());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Crater.Large());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Crater.Medium());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Crater.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Crater.Small());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.LogCrib.LogCrib());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.LogCrib.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.LogCrib.Rectangular());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.LogCrib.Triangular());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.PotHole.PotHole());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.RockDrop.RockDrop());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.RockDrop.RockDropCovered());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstacle.RockDrop.RockDropUncovered());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstaclemarker.Obstaclemarker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Obstaclemarker.NBCHazardMarker.NBCHazardMarker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.Passageway());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.AVLB.AVLB());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.AVLB.JointAssaultBridgeJAB());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.AVLB.M60A1());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.AVLB.MTU20());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.AVLB.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.Pier.Pier());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.RibbonBridge.RibbonBridge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.RibbonBridge.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.RibbonBridge._2Lane());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.RibbonBridge._4Lane());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.StationaryBridge.StationaryBridge());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.StationaryBridge.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.StationaryBridge._2Lane());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Passageway.StationaryBridge._4Lane());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.Preparedposition());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.CoveredMachineGunBunker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.HastyFightingPosition());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.InfantryFightingPosition());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.NonCoveredInfantryPosition());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.NonCoveredMachineGunBunker());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.InfantryFightingPosition.OverheadCoveredInfantryPosition());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.VehicleDefilade.ArmoredVehicle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.VehicleDefilade.FightingVehicle());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.VehicleDefilade.MortarCarrier());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.VehicleDefilade.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.VehicleDefilade.Tank());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Preparedposition.VehicleDefilade.VehicleDefilade());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.Tacticalsmoke());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.AirBurst.AirBurst());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.AirBurst.Grenade());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.AirBurst.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.GroundBurst.GroundBurst());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.GroundBurst.Artillery());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.GroundBurst.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.Other.Other());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Green());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Red());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Violet());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M18Yellow());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.M83White());
+      dumpObjectType(new edu.nps.moves.dis7.objectTypes.PointObject.Tacticalsmoke.TacticalSmokeCanister.TacticalSmokeCanister());
 
     }
     catch (Throwable t) {
diff --git a/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java b/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java
index 28fa9794e88e3158730888549cf5c60bc310822f..76f76cecb1245241a7f676efe10d18c093b4097e 100644
--- a/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java
+++ b/test/edu/nps/moves/dis7/CreateAllPduTypesTest.java
@@ -4,6 +4,79 @@
  */
 package edu.nps.moves.dis7;
 
+import edu.nps.moves.dis7.pdus.AcknowledgePdu;
+import edu.nps.moves.dis7.pdus.AcknowledgeReliablePdu;
+import edu.nps.moves.dis7.pdus.ActionRequestPdu;
+import edu.nps.moves.dis7.pdus.ActionRequestReliablePdu;
+import edu.nps.moves.dis7.pdus.ActionResponsePdu;
+import edu.nps.moves.dis7.pdus.ActionResponseReliablePdu;
+import edu.nps.moves.dis7.pdus.AggregateStatePdu;
+import edu.nps.moves.dis7.pdus.AppearancePdu;
+import edu.nps.moves.dis7.pdus.ArealObjectStatePdu;
+import edu.nps.moves.dis7.pdus.ArticulatedPartsPdu;
+import edu.nps.moves.dis7.pdus.AttributePdu;
+import edu.nps.moves.dis7.pdus.CollisionElasticPdu;
+import edu.nps.moves.dis7.pdus.CollisionPdu;
+import edu.nps.moves.dis7.pdus.CommentPdu;
+import edu.nps.moves.dis7.pdus.CommentReliablePdu;
+import edu.nps.moves.dis7.pdus.CreateEntityPdu;
+import edu.nps.moves.dis7.pdus.CreateEntityReliablePdu;
+import edu.nps.moves.dis7.pdus.DataPdu;
+import edu.nps.moves.dis7.pdus.DataQueryPdu;
+import edu.nps.moves.dis7.pdus.DataQueryReliablePdu;
+import edu.nps.moves.dis7.pdus.DataReliablePdu;
+import edu.nps.moves.dis7.pdus.DesignatorPdu;
+import edu.nps.moves.dis7.pdus.DetonationPdu;
+import edu.nps.moves.dis7.pdus.DirectedEnergyFirePdu;
+import edu.nps.moves.dis7.pdus.ElectromagneticEmissionPdu;
+import edu.nps.moves.dis7.pdus.EntityDamageStatusPdu;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.EntityStateUpdatePdu;
+import edu.nps.moves.dis7.pdus.EnvironmentalProcessPdu;
+import edu.nps.moves.dis7.pdus.EventReportPdu;
+import edu.nps.moves.dis7.pdus.EventReportReliablePdu;
+import edu.nps.moves.dis7.pdus.FirePdu;
+import edu.nps.moves.dis7.pdus.GriddedDataPdu;
+import edu.nps.moves.dis7.pdus.IFFPdu;
+import edu.nps.moves.dis7.pdus.InformationOperationsActionPdu;
+import edu.nps.moves.dis7.pdus.InformationOperationsReportPdu;
+import edu.nps.moves.dis7.pdus.IntercomControlPdu;
+import edu.nps.moves.dis7.pdus.IntercomSignalPdu;
+import edu.nps.moves.dis7.pdus.IsGroupOfPdu;
+import edu.nps.moves.dis7.pdus.IsPartOfPdu;
+import edu.nps.moves.dis7.pdus.LEDetonationPdu;
+import edu.nps.moves.dis7.pdus.LEFirePdu;
+import edu.nps.moves.dis7.pdus.LinearObjectStatePdu;
+import edu.nps.moves.dis7.pdus.Marshaller;
+import edu.nps.moves.dis7.pdus.MinefieldDataPdu;
+import edu.nps.moves.dis7.pdus.MinefieldQueryPdu;
+import edu.nps.moves.dis7.pdus.MinefieldResponseNACKPdu;
+import edu.nps.moves.dis7.pdus.MinefieldStatePdu;
+import edu.nps.moves.dis7.pdus.PointObjectStatePdu;
+import edu.nps.moves.dis7.pdus.ReceiverPdu;
+import edu.nps.moves.dis7.pdus.RecordQueryReliablePdu;
+import edu.nps.moves.dis7.pdus.RecordReliablePdu;
+import edu.nps.moves.dis7.pdus.RemoveEntityPdu;
+import edu.nps.moves.dis7.pdus.RemoveEntityReliablePdu;
+import edu.nps.moves.dis7.pdus.RepairCompletePdu;
+import edu.nps.moves.dis7.pdus.RepairResponsePdu;
+import edu.nps.moves.dis7.pdus.ResupplyCancelPdu;
+import edu.nps.moves.dis7.pdus.ResupplyOfferPdu;
+import edu.nps.moves.dis7.pdus.ResupplyReceivedPdu;
+import edu.nps.moves.dis7.pdus.SEESPdu;
+import edu.nps.moves.dis7.pdus.ServiceRequestPdu;
+import edu.nps.moves.dis7.pdus.SetDataPdu;
+import edu.nps.moves.dis7.pdus.SetDataReliablePdu;
+import edu.nps.moves.dis7.pdus.SetRecordReliablePdu;
+import edu.nps.moves.dis7.pdus.SignalPdu;
+import edu.nps.moves.dis7.pdus.StartResumePdu;
+import edu.nps.moves.dis7.pdus.StartResumeReliablePdu;
+import edu.nps.moves.dis7.pdus.StopFreezePdu;
+import edu.nps.moves.dis7.pdus.StopFreezeReliablePdu;
+import edu.nps.moves.dis7.pdus.TSPIPdu;
+import edu.nps.moves.dis7.pdus.TransferOwnershipPdu;
+import edu.nps.moves.dis7.pdus.TransmitterPdu;
+import edu.nps.moves.dis7.pdus.UnderwaterAcousticPdu;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.util.HashSet;
diff --git a/test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java b/test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java
index 76fa487530ead29444721b32c87de49f9d63f671..e0801e428ed0020935b854b8ee5ed861317f46e4 100644
--- a/test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java
+++ b/test/edu/nps/moves/dis7/DataQueryPduRoundTripTest.java
@@ -5,6 +5,10 @@
 package edu.nps.moves.dis7;
 
 import edu.nps.moves.dis7.enumerations.VariableRecordType;
+import edu.nps.moves.dis7.pdus.DataQueryPdu;
+import edu.nps.moves.dis7.pdus.FixedDatum;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.VariableDatum;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import org.junit.jupiter.api.*;
diff --git a/test/edu/nps/moves/dis7/EntityStatePduTest.java b/test/edu/nps/moves/dis7/EntityStatePduTest.java
index 0bc08196eea9fd72b9fe736ef45aad287dd3258f..3411e9b961d5fbad743632890354b8034c9a8a17 100644
--- a/test/edu/nps/moves/dis7/EntityStatePduTest.java
+++ b/test/edu/nps/moves/dis7/EntityStatePduTest.java
@@ -9,6 +9,12 @@ import edu.nps.moves.dis7.enumerations.Country;
 import edu.nps.moves.dis7.enumerations.EntityKind;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import edu.nps.moves.dis7.enumerations.PlatformDomain;
+import edu.nps.moves.dis7.pdus.Domain;
+import edu.nps.moves.dis7.pdus.EntityID;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.EntityType;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.PduBase;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java b/test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java
index e9f223b0c92a651abd458bdc1d7c07643119a6d0..f068398d3e2114badd57b6a5a71e78c20d461059 100644
--- a/test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java
+++ b/test/edu/nps/moves/dis7/FixedAndVariableDatumRoundTripTest.java
@@ -5,6 +5,10 @@
 package edu.nps.moves.dis7;
 
 import edu.nps.moves.dis7.enumerations.VariableRecordType;
+import edu.nps.moves.dis7.pdus.ActionResponsePdu;
+import edu.nps.moves.dis7.pdus.FixedDatum;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.VariableDatum;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import org.junit.jupiter.api.*;
diff --git a/test/edu/nps/moves/dis7/MarshalEnumsTest.java b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
index 87ba13c8a3db3753e7a94ccf18519f8b8eda5a08..4b89299d07e44d9470ce4b0ea7ed44756fddfe9e 100644
--- a/test/edu/nps/moves/dis7/MarshalEnumsTest.java
+++ b/test/edu/nps/moves/dis7/MarshalEnumsTest.java
@@ -5,6 +5,7 @@
 package edu.nps.moves.dis7;
 
 import edu.nps.moves.dis7.enumerations.*;
+import edu.nps.moves.dis7.pdus.DisBitSet;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import org.junit.jupiter.api.*;
diff --git a/test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java b/test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java
index 677fd2770be7661ccdb50e7373b459f2edceab8c..bc04d84ebd9cff90c98a151b81e22f33e6e0adb4 100644
--- a/test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java
+++ b/test/edu/nps/moves/dis7/NullFieldsEntityMarshallTest.java
@@ -5,6 +5,7 @@
 package edu.nps.moves.dis7;
 
 import edu.nps.moves.dis7.entities.usa.platform.land.LAV105;
+import edu.nps.moves.dis7.pdus.EntityType;
 import java.nio.ByteBuffer;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java b/test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java
index dd532fc371091a6d1bd364e27d251338e90b2564..165d2d36cc874bcda2f366db9766e768c2930162 100644
--- a/test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java
+++ b/test/edu/nps/moves/dis7/ObjectTypeMarshallTest.java
@@ -4,8 +4,9 @@
  */
 package edu.nps.moves.dis7;
 
-import edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.TracksTire.TracksTire;
-import edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire._2Roll;
+import edu.nps.moves.dis7.objectTypes.LinearObject.Culturalfeature.TracksTire.TracksTire;
+import edu.nps.moves.dis7.objectTypes.LinearObject.Obstacle.ConcertinaWire._2Roll;
+import edu.nps.moves.dis7.pdus.ObjectType;
 import java.nio.ByteBuffer;
 import org.junit.jupiter.api.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/test/edu/nps/moves/dis7/PduTest.java b/test/edu/nps/moves/dis7/PduTest.java
index 899c83b56a541e3d06123a062846eac45416e0ab..49aa3301c001cc5cfd6f4e8da52c70435b55cb2b 100644
--- a/test/edu/nps/moves/dis7/PduTest.java
+++ b/test/edu/nps/moves/dis7/PduTest.java
@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 package edu.nps.moves.dis7;
 
+import edu.nps.moves.dis7.pdus.Pdu;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
diff --git a/test/edu/nps/moves/dis7/SignalPdusTest.java b/test/edu/nps/moves/dis7/SignalPdusTest.java
index 68088e21b1d28b81ac72a89e5ba8e7d341401cb2..b7f756f2913161e2eceda320ea7af0df3c507418 100644
--- a/test/edu/nps/moves/dis7/SignalPdusTest.java
+++ b/test/edu/nps/moves/dis7/SignalPdusTest.java
@@ -4,6 +4,9 @@
  */
 package edu.nps.moves.dis7;
 
+import edu.nps.moves.dis7.pdus.IntercomSignalPdu;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.pdus.SignalPdu;
 import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
 import edu.nps.moves.dis7.utilities.PduFactory;
 import edu.nps.moves.dis7.utilities.stream.PduPlayer;