Subject: [PATCH] moves the structures to its structure-libraries
Fixes #85 / #119
---
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/ID.java b/hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/ID.java
rename to hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DT.java b/hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DT.java
rename to hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DTM.java b/hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DTM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DTM.java
rename to hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/DTM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DT.java b/hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DT.java
rename to hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DTM.java b/hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DTM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DTM.java
rename to hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/DTM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/IS.java b/hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/IS.java
rename to hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/TM.java b/hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/TM.java
rename to hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/DT.java b/hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/DT.java
rename to hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TSComponentOne.java b/hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TSComponentOne.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TSComponentOne.java
rename to hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TSComponentOne.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/IS.java b/hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/IS.java
rename to hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TM.java b/hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TM.java
rename to hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/IS.java b/hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/IS.java
rename to hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/TM.java b/hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v25/datatype/TM.java
rename to hapi-structures-v25/src/main/java/ca/uhn/hl7v2/model/v25/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/ID.java b/hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v24/datatype/ID.java
rename to hapi-structures-v24/src/main/java/ca/uhn/hl7v2/model/v24/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/TM.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/TM.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DT.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DT.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DTM.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DTM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DTM.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/DTM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/SNM.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/SNM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/SNM.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/SNM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/IS.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/IS.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/ID.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/ID.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/NULLDT.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/NULLDT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/NULLDT.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/NULLDT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/TM.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/TM.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/ID.java b/hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/ID.java
rename to hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/NULLDT.java b/hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/NULLDT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v26/datatype/NULLDT.java
rename to hapi-structures-v26/src/main/java/ca/uhn/hl7v2/model/v26/datatype/NULLDT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/SNM.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/SNM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/SNM.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/SNM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/IS.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/IS.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/ID.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/ID.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/NULLDT.java b/hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/NULLDT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v27/datatype/NULLDT.java
rename to hapi-structures-v27/src/main/java/ca/uhn/hl7v2/model/v27/datatype/NULLDT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DTM.java b/hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DTM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DTM.java
rename to hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DTM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/IS.java b/hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/IS.java
rename to hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/TM.java b/hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/TM.java
rename to hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/ID.java b/hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/ID.java
rename to hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/NULLDT.java b/hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/NULLDT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/NULLDT.java
rename to hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/NULLDT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DT.java b/hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DT.java
rename to hapi-structures-v251/src/main/java/ca/uhn/hl7v2/model/v251/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TM.java b/hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TM.java
rename to hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DT.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DT.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DTM.java b/hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DTM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DTM.java
rename to hapi-structures-v28/src/main/java/ca/uhn/hl7v2/model/v28/datatype/DTM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/ID.java b/hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/ID.java
rename to hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/DT.java b/hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/DT.java
rename to hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TSComponentOne.java b/hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TSComponentOne.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TSComponentOne.java
rename to hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/TSComponentOne.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/IS.java b/hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v231/datatype/IS.java
rename to hapi-structures-v231/src/main/java/ca/uhn/hl7v2/model/v231/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/IS.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/IS.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/ID.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/ID.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/NULLDT.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/NULLDT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/NULLDT.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/NULLDT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/TM.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/TM.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DT.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DT.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DTM.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DTM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DTM.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/DTM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/SNM.java b/hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/SNM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v281/datatype/SNM.java
rename to hapi-structures-v281/src/main/java/ca/uhn/hl7v2/model/v281/datatype/SNM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TS.java b/hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TS.java
rename to hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TM.java b/hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TM.java
rename to hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/IS.java b/hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/IS.java
rename to hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TM.java b/hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TM.java
rename to hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/ID.java b/hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/ID.java
rename to hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/ID.java b/hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/ID.java
rename to hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/DT.java b/hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/DT.java
rename to hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TSComponentOne.java b/hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TSComponentOne.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TSComponentOne.java
rename to hapi-structures-v23/src/main/java/ca/uhn/hl7v2/model/v23/datatype/TSComponentOne.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/ID.java b/hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/ID.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/ID.java
rename to hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/ID.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/CM.java b/hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/CM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/CM.java
rename to hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/CM.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/DT.java b/hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v21/datatype/DT.java
rename to hapi-structures-v21/src/main/java/ca/uhn/hl7v2/model/v21/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/DT.java b/hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/DT.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/DT.java
rename to hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/DT.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TSComponentOne.java b/hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TSComponentOne.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TSComponentOne.java
rename to hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TSComponentOne.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/IS.java b/hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/IS.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/IS.java
rename to hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/IS.java
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TM.java b/hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TM.java
rename from hapi-base/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TM.java
rename to hapi-structures-v22/src/main/java/ca/uhn/hl7v2/model/v22/datatype/TM.java