diff --git a/odm/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
similarity index 100%
rename from odm/checkstyle-suppressions.xml
rename to checkstyle-suppressions.xml
diff --git a/odm/checkstyle.xml b/checkstyle.xml
similarity index 100%
rename from odm/checkstyle.xml
rename to checkstyle.xml
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/CLDataType.java b/gensrc/org/cdisk/odm/jaxb/CLDataType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/CLDataType.java
rename to gensrc/org/cdisk/odm/jaxb/CLDataType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/CommentType.java b/gensrc/org/cdisk/odm/jaxb/CommentType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/CommentType.java
rename to gensrc/org/cdisk/odm/jaxb/CommentType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/Comparator.java b/gensrc/org/cdisk/odm/jaxb/Comparator.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/Comparator.java
rename to gensrc/org/cdisk/odm/jaxb/Comparator.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/DataType.java b/gensrc/org/cdisk/odm/jaxb/DataType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/DataType.java
rename to gensrc/org/cdisk/odm/jaxb/DataType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/EditPointType.java b/gensrc/org/cdisk/odm/jaxb/EditPointType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/EditPointType.java
rename to gensrc/org/cdisk/odm/jaxb/EditPointType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/EventType.java b/gensrc/org/cdisk/odm/jaxb/EventType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/EventType.java
rename to gensrc/org/cdisk/odm/jaxb/EventType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/FileType.java b/gensrc/org/cdisk/odm/jaxb/FileType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/FileType.java
rename to gensrc/org/cdisk/odm/jaxb/FileType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/Granularity.java b/gensrc/org/cdisk/odm/jaxb/Granularity.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/Granularity.java
rename to gensrc/org/cdisk/odm/jaxb/Granularity.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/LocationType.java b/gensrc/org/cdisk/odm/jaxb/LocationType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/LocationType.java
rename to gensrc/org/cdisk/odm/jaxb/LocationType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/MethodType.java b/gensrc/org/cdisk/odm/jaxb/MethodType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/MethodType.java
rename to gensrc/org/cdisk/odm/jaxb/MethodType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODM.java b/gensrc/org/cdisk/odm/jaxb/ODM.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODM.java
rename to gensrc/org/cdisk/odm/jaxb/ODM.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAddress.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAddress.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAddress.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAddress.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAdminData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAdminData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAdminData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAdminData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAlias.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAlias.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAlias.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAlias.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotation.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotation.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotation.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotation.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotations.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotations.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotations.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAnnotations.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayout.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayout.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayout.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayout.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayoutRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayoutRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayoutRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionArchiveLayoutRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAssociation.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAssociation.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAssociation.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAssociation.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecord.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecord.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecord.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecord.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecords.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecords.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecords.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionAuditRecords.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionBasicDefinitions.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionBasicDefinitions.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionBasicDefinitions.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionBasicDefinitions.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCertificate.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCertificate.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCertificate.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCertificate.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCheckValue.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCheckValue.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCheckValue.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCheckValue.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCity.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCity.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCity.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCity.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionClinicalData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionClinicalData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionClinicalData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionClinicalData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeList.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeList.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeList.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeList.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListItem.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListItem.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListItem.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListItem.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCodeListRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionComment.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionComment.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionComment.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionComment.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionConditionDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionConditionDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionConditionDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionConditionDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCountry.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCountry.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCountry.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCountry.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCryptoBindingManifest.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCryptoBindingManifest.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCryptoBindingManifest.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionCryptoBindingManifest.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDateTimeStamp.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDateTimeStamp.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDateTimeStamp.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDateTimeStamp.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDecode.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDecode.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDecode.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDecode.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDescription.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDescription.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDescription.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDescription.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDisplayName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDisplayName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDisplayName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionDisplayName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEmail.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEmail.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEmail.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEmail.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEnumeratedItem.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEnumeratedItem.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEnumeratedItem.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionEnumeratedItem.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionErrorMessage.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionErrorMessage.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionErrorMessage.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionErrorMessage.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalCodeList.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalCodeList.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalCodeList.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalCodeList.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalQuestion.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalQuestion.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalQuestion.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionExternalQuestion.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFax.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFax.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFax.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFax.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFirstName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFirstName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFirstName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFirstName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlag.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlag.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlag.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlag.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagType.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagType.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagValue.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagValue.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagValue.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFlagValue.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormalExpression.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormalExpression.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormalExpression.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFormalExpression.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFullName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFullName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFullName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionFullName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionGlobalVariables.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionGlobalVariables.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionGlobalVariables.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionGlobalVariables.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionImputationMethod.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionImputationMethod.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionImputationMethod.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionImputationMethod.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInclude.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInclude.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInclude.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInclude.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInvestigatorRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInvestigatorRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInvestigatorRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionInvestigatorRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataAny.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataAny.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataAny.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataAny.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Binary.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Binary.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Binary.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Binary.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Float.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Float.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Float.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBase64Float.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBoolean.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBoolean.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBoolean.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataBoolean.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDate.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDate.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDate.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDate.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDatetime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDatetime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDatetime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDatetime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDouble.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDouble.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDouble.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDouble.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDurationDatetime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDurationDatetime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDurationDatetime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataDurationDatetime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataFloat.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataFloat.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataFloat.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataFloat.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexBinary.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexBinary.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexBinary.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexBinary.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexFloat.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexFloat.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexFloat.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataHexFloat.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDate.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDate.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDate.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDate.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDatetime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDatetime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDatetime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteDatetime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteTime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteTime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteTime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIncompleteTime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataInteger.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataInteger.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataInteger.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataInteger.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIntervalDatetime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIntervalDatetime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIntervalDatetime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataIntervalDatetime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDate.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDate.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDate.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDate.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDatetime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDatetime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDatetime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialDatetime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialTime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialTime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialTime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataPartialTime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataString.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataString.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataString.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataString.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataTime.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataTime.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataTime.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataTime.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataURI.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataURI.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataURI.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDataURI.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemGroupRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionItemRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionKeySet.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionKeySet.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionKeySet.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionKeySet.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLastName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLastName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLastName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLastName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLegalReason.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLegalReason.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLegalReason.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLegalReason.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocation.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocation.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocation.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocation.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocationRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocationRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocationRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLocationRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLoginName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLoginName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLoginName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionLoginName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeaning.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeaning.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeaning.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeaning.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnit.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnit.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnit.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnit.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnitRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnitRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnitRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMeasurementUnitRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersion.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersion.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersion.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersion.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersionRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersionRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersionRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMetaDataVersionRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMethodDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMethodDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMethodDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionMethodDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOrganization.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOrganization.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOrganization.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOrganization.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOtherText.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOtherText.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOtherText.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionOtherText.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPager.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPager.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPager.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPager.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPhone.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPhone.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPhone.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPhone.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPicture.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPicture.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPicture.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPicture.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPostalCode.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPostalCode.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPostalCode.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPostalCode.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPresentation.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPresentation.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPresentation.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionPresentation.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocol.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocol.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocol.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocol.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocolName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocolName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocolName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionProtocolName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionQuestion.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionQuestion.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionQuestion.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionQuestion.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRangeCheck.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRangeCheck.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRangeCheck.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRangeCheck.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReasonForChange.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReasonForChange.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReasonForChange.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReasonForChange.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReferenceData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReferenceData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReferenceData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionReferenceData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRole.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRole.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRole.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionRole.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignature.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignature.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignature.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignature.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatureRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatures.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatures.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatures.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSignatures.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSiteRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSiteRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSiteRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSiteRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSourceID.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSourceID.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSourceID.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSourceID.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStateProv.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStateProv.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStateProv.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStateProv.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStreetName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStreetName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStreetName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStreetName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudy.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudy.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudy.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudy.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyDescription.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyDescription.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyDescription.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyDescription.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventDef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventDef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventDef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventDef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyEventRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyName.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyName.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyName.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionStudyName.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSubjectData.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSubjectData.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSubjectData.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSubjectData.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSymbol.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSymbol.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSymbol.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionSymbol.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionTranslatedText.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionTranslatedText.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionTranslatedText.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionTranslatedText.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUser.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUser.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUser.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUser.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUserRef.java b/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUserRef.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUserRef.java
rename to gensrc/org/cdisk/odm/jaxb/ODMcomplexTypeDefinitionUserRef.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/ObjectFactory.java b/gensrc/org/cdisk/odm/jaxb/ObjectFactory.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/ObjectFactory.java
rename to gensrc/org/cdisk/odm/jaxb/ObjectFactory.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/SignMethod.java b/gensrc/org/cdisk/odm/jaxb/SignMethod.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/SignMethod.java
rename to gensrc/org/cdisk/odm/jaxb/SignMethod.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/SoftOrHard.java b/gensrc/org/cdisk/odm/jaxb/SoftOrHard.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/SoftOrHard.java
rename to gensrc/org/cdisk/odm/jaxb/SoftOrHard.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/TransactionType.java b/gensrc/org/cdisk/odm/jaxb/TransactionType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/TransactionType.java
rename to gensrc/org/cdisk/odm/jaxb/TransactionType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/UserType.java b/gensrc/org/cdisk/odm/jaxb/UserType.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/UserType.java
rename to gensrc/org/cdisk/odm/jaxb/UserType.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/YesOnly.java b/gensrc/org/cdisk/odm/jaxb/YesOnly.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/YesOnly.java
rename to gensrc/org/cdisk/odm/jaxb/YesOnly.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/YesOrNo.java b/gensrc/org/cdisk/odm/jaxb/YesOrNo.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/YesOrNo.java
rename to gensrc/org/cdisk/odm/jaxb/YesOrNo.java
diff --git a/odm/gensrc/org/cdisk/odm/jaxb/package-info.java b/gensrc/org/cdisk/odm/jaxb/package-info.java
similarity index 100%
rename from odm/gensrc/org/cdisk/odm/jaxb/package-info.java
rename to gensrc/org/cdisk/odm/jaxb/package-info.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/CanonicalizationMethodType.java b/gensrc/org/w3/xmldsig/jaxb/CanonicalizationMethodType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/CanonicalizationMethodType.java
rename to gensrc/org/w3/xmldsig/jaxb/CanonicalizationMethodType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/DSAKeyValueType.java b/gensrc/org/w3/xmldsig/jaxb/DSAKeyValueType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/DSAKeyValueType.java
rename to gensrc/org/w3/xmldsig/jaxb/DSAKeyValueType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/DigestMethodType.java b/gensrc/org/w3/xmldsig/jaxb/DigestMethodType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/DigestMethodType.java
rename to gensrc/org/w3/xmldsig/jaxb/DigestMethodType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/KeyInfoType.java b/gensrc/org/w3/xmldsig/jaxb/KeyInfoType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/KeyInfoType.java
rename to gensrc/org/w3/xmldsig/jaxb/KeyInfoType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/KeyValueType.java b/gensrc/org/w3/xmldsig/jaxb/KeyValueType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/KeyValueType.java
rename to gensrc/org/w3/xmldsig/jaxb/KeyValueType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/ManifestType.java b/gensrc/org/w3/xmldsig/jaxb/ManifestType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/ManifestType.java
rename to gensrc/org/w3/xmldsig/jaxb/ManifestType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/ObjectFactory.java b/gensrc/org/w3/xmldsig/jaxb/ObjectFactory.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/ObjectFactory.java
rename to gensrc/org/w3/xmldsig/jaxb/ObjectFactory.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/ObjectType.java b/gensrc/org/w3/xmldsig/jaxb/ObjectType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/ObjectType.java
rename to gensrc/org/w3/xmldsig/jaxb/ObjectType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/PGPDataType.java b/gensrc/org/w3/xmldsig/jaxb/PGPDataType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/PGPDataType.java
rename to gensrc/org/w3/xmldsig/jaxb/PGPDataType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/RSAKeyValueType.java b/gensrc/org/w3/xmldsig/jaxb/RSAKeyValueType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/RSAKeyValueType.java
rename to gensrc/org/w3/xmldsig/jaxb/RSAKeyValueType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/ReferenceType.java b/gensrc/org/w3/xmldsig/jaxb/ReferenceType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/ReferenceType.java
rename to gensrc/org/w3/xmldsig/jaxb/ReferenceType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/RetrievalMethodType.java b/gensrc/org/w3/xmldsig/jaxb/RetrievalMethodType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/RetrievalMethodType.java
rename to gensrc/org/w3/xmldsig/jaxb/RetrievalMethodType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SPKIDataType.java b/gensrc/org/w3/xmldsig/jaxb/SPKIDataType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SPKIDataType.java
rename to gensrc/org/w3/xmldsig/jaxb/SPKIDataType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SignatureMethodType.java b/gensrc/org/w3/xmldsig/jaxb/SignatureMethodType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SignatureMethodType.java
rename to gensrc/org/w3/xmldsig/jaxb/SignatureMethodType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SignaturePropertiesType.java b/gensrc/org/w3/xmldsig/jaxb/SignaturePropertiesType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SignaturePropertiesType.java
rename to gensrc/org/w3/xmldsig/jaxb/SignaturePropertiesType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SignaturePropertyType.java b/gensrc/org/w3/xmldsig/jaxb/SignaturePropertyType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SignaturePropertyType.java
rename to gensrc/org/w3/xmldsig/jaxb/SignaturePropertyType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SignatureType.java b/gensrc/org/w3/xmldsig/jaxb/SignatureType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SignatureType.java
rename to gensrc/org/w3/xmldsig/jaxb/SignatureType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SignatureValueType.java b/gensrc/org/w3/xmldsig/jaxb/SignatureValueType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SignatureValueType.java
rename to gensrc/org/w3/xmldsig/jaxb/SignatureValueType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/SignedInfoType.java b/gensrc/org/w3/xmldsig/jaxb/SignedInfoType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/SignedInfoType.java
rename to gensrc/org/w3/xmldsig/jaxb/SignedInfoType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/TransformType.java b/gensrc/org/w3/xmldsig/jaxb/TransformType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/TransformType.java
rename to gensrc/org/w3/xmldsig/jaxb/TransformType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/TransformsType.java b/gensrc/org/w3/xmldsig/jaxb/TransformsType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/TransformsType.java
rename to gensrc/org/w3/xmldsig/jaxb/TransformsType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/X509DataType.java b/gensrc/org/w3/xmldsig/jaxb/X509DataType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/X509DataType.java
rename to gensrc/org/w3/xmldsig/jaxb/X509DataType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/X509IssuerSerialType.java b/gensrc/org/w3/xmldsig/jaxb/X509IssuerSerialType.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/X509IssuerSerialType.java
rename to gensrc/org/w3/xmldsig/jaxb/X509IssuerSerialType.java
diff --git a/odm/gensrc/org/w3/xmldsig/jaxb/package-info.java b/gensrc/org/w3/xmldsig/jaxb/package-info.java
similarity index 100%
rename from odm/gensrc/org/w3/xmldsig/jaxb/package-info.java
rename to gensrc/org/w3/xmldsig/jaxb/package-info.java
diff --git a/odm/pom.xml b/pom.xml
similarity index 100%
rename from odm/pom.xml
rename to pom.xml
diff --git a/odm/src/com/recomdata/config/Config.java b/src/com/recomdata/config/Config.java
similarity index 100%
rename from odm/src/com/recomdata/config/Config.java
rename to src/com/recomdata/config/Config.java
diff --git a/odm/src/com/recomdata/i2b2/I2B2ODMStudyHandler.java b/src/com/recomdata/i2b2/I2B2ODMStudyHandler.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/I2B2ODMStudyHandler.java
rename to src/com/recomdata/i2b2/I2B2ODMStudyHandler.java
diff --git a/odm/src/com/recomdata/i2b2/I2B2ODMStudyHandlerCMLClient.java b/src/com/recomdata/i2b2/I2B2ODMStudyHandlerCMLClient.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/I2B2ODMStudyHandlerCMLClient.java
rename to src/com/recomdata/i2b2/I2B2ODMStudyHandlerCMLClient.java
diff --git a/odm/src/com/recomdata/i2b2/IConstants.java b/src/com/recomdata/i2b2/IConstants.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/IConstants.java
rename to src/com/recomdata/i2b2/IConstants.java
diff --git a/odm/src/com/recomdata/i2b2/MetaDataXML.java b/src/com/recomdata/i2b2/MetaDataXML.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/MetaDataXML.java
rename to src/com/recomdata/i2b2/MetaDataXML.java
diff --git a/odm/src/com/recomdata/i2b2/dao/ClinicalDataDao.java b/src/com/recomdata/i2b2/dao/ClinicalDataDao.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/dao/ClinicalDataDao.java
rename to src/com/recomdata/i2b2/dao/ClinicalDataDao.java
diff --git a/odm/src/com/recomdata/i2b2/dao/I2B2DBUtils.java b/src/com/recomdata/i2b2/dao/I2B2DBUtils.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/dao/I2B2DBUtils.java
rename to src/com/recomdata/i2b2/dao/I2B2DBUtils.java
diff --git a/odm/src/com/recomdata/i2b2/dao/IClinicalDataDao.java b/src/com/recomdata/i2b2/dao/IClinicalDataDao.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/dao/IClinicalDataDao.java
rename to src/com/recomdata/i2b2/dao/IClinicalDataDao.java
diff --git a/odm/src/com/recomdata/i2b2/dao/IStudyDao.java b/src/com/recomdata/i2b2/dao/IStudyDao.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/dao/IStudyDao.java
rename to src/com/recomdata/i2b2/dao/IStudyDao.java
diff --git a/odm/src/com/recomdata/i2b2/dao/StudyDao.java b/src/com/recomdata/i2b2/dao/StudyDao.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/dao/StudyDao.java
rename to src/com/recomdata/i2b2/dao/StudyDao.java
diff --git a/odm/src/com/recomdata/i2b2/entity/I2B2ClinicalDataInfo.java b/src/com/recomdata/i2b2/entity/I2B2ClinicalDataInfo.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/entity/I2B2ClinicalDataInfo.java
rename to src/com/recomdata/i2b2/entity/I2B2ClinicalDataInfo.java
diff --git a/odm/src/com/recomdata/i2b2/entity/I2B2StudyInfo.java b/src/com/recomdata/i2b2/entity/I2B2StudyInfo.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/entity/I2B2StudyInfo.java
rename to src/com/recomdata/i2b2/entity/I2B2StudyInfo.java
diff --git a/odm/src/com/recomdata/i2b2/util/ODMUtil.java b/src/com/recomdata/i2b2/util/ODMUtil.java
similarity index 100%
rename from odm/src/com/recomdata/i2b2/util/ODMUtil.java
rename to src/com/recomdata/i2b2/util/ODMUtil.java
diff --git a/odm/src/com/recomdata/odm/MetaDataWithIncludes.java b/src/com/recomdata/odm/MetaDataWithIncludes.java
similarity index 100%
rename from odm/src/com/recomdata/odm/MetaDataWithIncludes.java
rename to src/com/recomdata/odm/MetaDataWithIncludes.java
diff --git a/odm/src/com/recomdata/odm/ODMLoader.java b/src/com/recomdata/odm/ODMLoader.java
similarity index 100%
rename from odm/src/com/recomdata/odm/ODMLoader.java
rename to src/com/recomdata/odm/ODMLoader.java
diff --git a/odm/src/com/recomdata/odm/package-info.java b/src/com/recomdata/odm/package-info.java
similarity index 100%
rename from odm/src/com/recomdata/odm/package-info.java
rename to src/com/recomdata/odm/package-info.java
diff --git a/odm/src/com/recomdata/redcap/odm/Redcap2ODM.java b/src/com/recomdata/redcap/odm/Redcap2ODM.java
similarity index 100%
rename from odm/src/com/recomdata/redcap/odm/Redcap2ODM.java
rename to src/com/recomdata/redcap/odm/Redcap2ODM.java
diff --git a/odm/src/com/recomdata/redcap/odm/Redcap2ODMTest.java b/src/com/recomdata/redcap/odm/Redcap2ODMTest.java
similarity index 100%
rename from odm/src/com/recomdata/redcap/odm/Redcap2ODMTest.java
rename to src/com/recomdata/redcap/odm/Redcap2ODMTest.java
diff --git a/odm/src/com/recomdata/redcap/odm/RedcapODMUtils.java b/src/com/recomdata/redcap/odm/RedcapODMUtils.java
similarity index 100%
rename from odm/src/com/recomdata/redcap/odm/RedcapODMUtils.java
rename to src/com/recomdata/redcap/odm/RedcapODMUtils.java
diff --git a/odm/src/com/recomdata/redcap/ws/GetRedcapService.java b/src/com/recomdata/redcap/ws/GetRedcapService.java
similarity index 100%
rename from odm/src/com/recomdata/redcap/ws/GetRedcapService.java
rename to src/com/recomdata/redcap/ws/GetRedcapService.java
diff --git a/odm/src/config.properties b/src/config.properties
similarity index 100%
rename from odm/src/config.properties
rename to src/config.properties
diff --git a/odm/src/log4j.properties b/src/log4j.properties
similarity index 100%
rename from odm/src/log4j.properties
rename to src/log4j.properties
diff --git a/odm/src/nl/vumc/odmtoi2b2/export/Configuration.java b/src/nl/vumc/odmtoi2b2/export/Configuration.java
similarity index 100%
rename from odm/src/nl/vumc/odmtoi2b2/export/Configuration.java
rename to src/nl/vumc/odmtoi2b2/export/Configuration.java
diff --git a/odm/src/nl/vumc/odmtoi2b2/export/FileExporter.java b/src/nl/vumc/odmtoi2b2/export/FileExporter.java
similarity index 100%
rename from odm/src/nl/vumc/odmtoi2b2/export/FileExporter.java
rename to src/nl/vumc/odmtoi2b2/export/FileExporter.java
diff --git a/odm/src/nl/vumc/odmtoi2b2/export/ItemRepeatMetaDataTree.java b/src/nl/vumc/odmtoi2b2/export/ItemRepeatMetaDataTree.java
similarity index 100%
rename from odm/src/nl/vumc/odmtoi2b2/export/ItemRepeatMetaDataTree.java
rename to src/nl/vumc/odmtoi2b2/export/ItemRepeatMetaDataTree.java
diff --git a/odm/src/nl/vumc/odmtoi2b2/export/OdmToFilesConverter.java b/src/nl/vumc/odmtoi2b2/export/OdmToFilesConverter.java
similarity index 100%
rename from odm/src/nl/vumc/odmtoi2b2/export/OdmToFilesConverter.java
rename to src/nl/vumc/odmtoi2b2/export/OdmToFilesConverter.java
diff --git a/odm/src/nl/vumc/odmtoi2b2/export/package-info.java b/src/nl/vumc/odmtoi2b2/export/package-info.java
similarity index 100%
rename from odm/src/nl/vumc/odmtoi2b2/export/package-info.java
rename to src/nl/vumc/odmtoi2b2/export/package-info.java
diff --git a/odm/test/java/com/recomdata/i2b2/I2B2ODMStudyHandlerClientTest.java b/test/java/com/recomdata/i2b2/I2B2ODMStudyHandlerClientTest.java
similarity index 100%
rename from odm/test/java/com/recomdata/i2b2/I2B2ODMStudyHandlerClientTest.java
rename to test/java/com/recomdata/i2b2/I2B2ODMStudyHandlerClientTest.java
diff --git a/odm/test/java/nl/vumc/odmtoi2b2/export/ConfigurationTest.java b/test/java/nl/vumc/odmtoi2b2/export/ConfigurationTest.java
similarity index 100%
rename from odm/test/java/nl/vumc/odmtoi2b2/export/ConfigurationTest.java
rename to test/java/nl/vumc/odmtoi2b2/export/ConfigurationTest.java
diff --git a/odm/test/resources/nl/vumc/odmtoi2b2/export/empty-configuration.properties b/test/resources/nl/vumc/odmtoi2b2/export/empty-configuration.properties
similarity index 100%
rename from odm/test/resources/nl/vumc/odmtoi2b2/export/empty-configuration.properties
rename to test/resources/nl/vumc/odmtoi2b2/export/empty-configuration.properties
diff --git a/odm/test/resources/nl/vumc/odmtoi2b2/export/filled-configuration.properties b/test/resources/nl/vumc/odmtoi2b2/export/filled-configuration.properties
similarity index 100%
rename from odm/test/resources/nl/vumc/odmtoi2b2/export/filled-configuration.properties
rename to test/resources/nl/vumc/odmtoi2b2/export/filled-configuration.properties