diff --git a/src/main/java/org/apache/commons/digester3/AbstractMethodRule.java b/core/src/main/java/org/apache/commons/digester3/AbstractMethodRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/AbstractMethodRule.java
rename to core/src/main/java/org/apache/commons/digester3/AbstractMethodRule.java
diff --git a/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java b/core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java
rename to core/src/main/java/org/apache/commons/digester3/AbstractObjectCreationFactory.java
diff --git a/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java b/core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java
rename to core/src/main/java/org/apache/commons/digester3/AbstractRulesImpl.java
diff --git a/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java b/core/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
rename to core/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
diff --git a/src/main/java/org/apache/commons/digester3/CallMethodRule.java b/core/src/main/java/org/apache/commons/digester3/CallMethodRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/CallMethodRule.java
rename to core/src/main/java/org/apache/commons/digester3/CallMethodRule.java
diff --git a/src/main/java/org/apache/commons/digester3/CallParamRule.java b/core/src/main/java/org/apache/commons/digester3/CallParamRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/CallParamRule.java
rename to core/src/main/java/org/apache/commons/digester3/CallParamRule.java
diff --git a/src/main/java/org/apache/commons/digester3/Digester.java b/core/src/main/java/org/apache/commons/digester3/Digester.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/Digester.java
rename to core/src/main/java/org/apache/commons/digester3/Digester.java
diff --git a/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
rename to core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
diff --git a/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java b/core/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/NodeCreateRule.java b/core/src/main/java/org/apache/commons/digester3/NodeCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/NodeCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/NodeCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java b/core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/ObjectCreationFactory.java b/core/src/main/java/org/apache/commons/digester3/ObjectCreationFactory.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/ObjectCreationFactory.java
rename to core/src/main/java/org/apache/commons/digester3/ObjectCreationFactory.java
diff --git a/src/main/java/org/apache/commons/digester3/ObjectParamRule.java b/core/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/ObjectParamRule.java
rename to core/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
diff --git a/src/main/java/org/apache/commons/digester3/PathCallParamRule.java b/core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/PathCallParamRule.java
rename to core/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
diff --git a/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java b/core/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java
rename to core/src/main/java/org/apache/commons/digester3/PatternRuleMatcher.java
diff --git a/src/main/java/org/apache/commons/digester3/RecordedInvocation.java b/core/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RecordedInvocation.java
rename to core/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
diff --git a/src/main/java/org/apache/commons/digester3/RegexMatcher.java b/core/src/main/java/org/apache/commons/digester3/RegexMatcher.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RegexMatcher.java
rename to core/src/main/java/org/apache/commons/digester3/RegexMatcher.java
diff --git a/src/main/java/org/apache/commons/digester3/RegexRules.java b/core/src/main/java/org/apache/commons/digester3/RegexRules.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RegexRules.java
rename to core/src/main/java/org/apache/commons/digester3/RegexRules.java
diff --git a/src/main/java/org/apache/commons/digester3/Rule.java b/core/src/main/java/org/apache/commons/digester3/Rule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/Rule.java
rename to core/src/main/java/org/apache/commons/digester3/Rule.java
diff --git a/src/main/java/org/apache/commons/digester3/RuleMatcher.java b/core/src/main/java/org/apache/commons/digester3/RuleMatcher.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RuleMatcher.java
rename to core/src/main/java/org/apache/commons/digester3/RuleMatcher.java
diff --git a/src/main/java/org/apache/commons/digester3/RuleSet.java b/core/src/main/java/org/apache/commons/digester3/RuleSet.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RuleSet.java
rename to core/src/main/java/org/apache/commons/digester3/RuleSet.java
diff --git a/src/main/java/org/apache/commons/digester3/RuleSetBase.java b/core/src/main/java/org/apache/commons/digester3/RuleSetBase.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RuleSetBase.java
rename to core/src/main/java/org/apache/commons/digester3/RuleSetBase.java
diff --git a/src/main/java/org/apache/commons/digester3/Rules.java b/core/src/main/java/org/apache/commons/digester3/Rules.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/Rules.java
rename to core/src/main/java/org/apache/commons/digester3/Rules.java
diff --git a/src/main/java/org/apache/commons/digester3/RulesBase.java b/core/src/main/java/org/apache/commons/digester3/RulesBase.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/RulesBase.java
rename to core/src/main/java/org/apache/commons/digester3/RulesBase.java
diff --git a/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java b/core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
rename to core/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
diff --git a/src/main/java/org/apache/commons/digester3/SetNextRule.java b/core/src/main/java/org/apache/commons/digester3/SetNextRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SetNextRule.java
rename to core/src/main/java/org/apache/commons/digester3/SetNextRule.java
diff --git a/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java b/core/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
rename to core/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
diff --git a/src/main/java/org/apache/commons/digester3/SetPropertyRule.java b/core/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SetPropertyRule.java
rename to core/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
diff --git a/src/main/java/org/apache/commons/digester3/SetRootRule.java b/core/src/main/java/org/apache/commons/digester3/SetRootRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SetRootRule.java
rename to core/src/main/java/org/apache/commons/digester3/SetRootRule.java
diff --git a/src/main/java/org/apache/commons/digester3/SetTopRule.java b/core/src/main/java/org/apache/commons/digester3/SetTopRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SetTopRule.java
rename to core/src/main/java/org/apache/commons/digester3/SetTopRule.java
diff --git a/src/main/java/org/apache/commons/digester3/SimpleRegexMatcher.java b/core/src/main/java/org/apache/commons/digester3/SimpleRegexMatcher.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/SimpleRegexMatcher.java
rename to core/src/main/java/org/apache/commons/digester3/SimpleRegexMatcher.java
diff --git a/src/main/java/org/apache/commons/digester3/StackAction.java b/core/src/main/java/org/apache/commons/digester3/StackAction.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/StackAction.java
rename to core/src/main/java/org/apache/commons/digester3/StackAction.java
diff --git a/src/main/java/org/apache/commons/digester3/Substitutor.java b/core/src/main/java/org/apache/commons/digester3/Substitutor.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/Substitutor.java
rename to core/src/main/java/org/apache/commons/digester3/Substitutor.java
diff --git a/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java b/core/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
rename to core/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/AnnotationHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/AnnotationHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/AnnotationHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/AnnotationHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/AnnotationHandlerFactory.java b/core/src/main/java/org/apache/commons/digester3/annotations/AnnotationHandlerFactory.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/AnnotationHandlerFactory.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/AnnotationHandlerFactory.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java b/core/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/DefaultAnnotationHandlerFactory.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/DigesterRule.java b/core/src/main/java/org/apache/commons/digester3/annotations/DigesterRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/DigesterRule.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/DigesterRule.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/DigesterRuleList.java b/core/src/main/java/org/apache/commons/digester3/annotations/DigesterRuleList.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/DigesterRuleList.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/DigesterRuleList.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java b/core/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/AbstractMethodHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/BeanPropertySetterHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallMethodHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/CallParamHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/FactoryCreateHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/ObjectCreateHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/PathCallParamHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/SetNextHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetNextHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/SetNextHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetNextHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetPropertiesHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/SetRootHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetRootHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/SetRootHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetRootHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/SetTopHandler.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java b/core/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/reflect/MethodArgument.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/CreationRule.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/CreationRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/CreationRule.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/CreationRule.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/FactoryCreate.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/FactoryCreate.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/FactoryCreate.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/FactoryCreate.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/ObjectCreate.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/ObjectCreate.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/ObjectCreate.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/ObjectCreate.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/SetNext.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetNext.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/SetNext.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/SetNext.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/SetRoot.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetRoot.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/SetRoot.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/SetRoot.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/utils/AnnotationUtils.java b/core/src/main/java/org/apache/commons/digester3/annotations/utils/AnnotationUtils.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/utils/AnnotationUtils.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/utils/AnnotationUtils.java
diff --git a/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/AbstractBackToLinkedRuleBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/AbstractNamespaceURIBasedRulesModule.java b/core/src/main/java/org/apache/commons/digester3/binder/AbstractNamespaceURIBasedRulesModule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/AbstractNamespaceURIBasedRulesModule.java
rename to core/src/main/java/org/apache/commons/digester3/binder/AbstractNamespaceURIBasedRulesModule.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/AbstractParamTypeBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/AbstractParamTypeBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/AbstractParamTypeBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/AbstractParamTypeBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java b/core/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java
rename to core/src/main/java/org/apache/commons/digester3/binder/AbstractRulesModule.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/AddAliasBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/AddAliasBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/AddAliasBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/AddAliasBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/BeanPropertySetterBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/BeanPropertySetterBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/BeanPropertySetterBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/BeanPropertySetterBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java b/core/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java
rename to core/src/main/java/org/apache/commons/digester3/binder/BinderClassLoader.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/ByRuleBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/ByRuleBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/ByRuleBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/ByRuleBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/ByRuleProviderBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/ByRuleProviderBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/ByRuleProviderBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/ByRuleProviderBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/CallMethodBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/CallMethodBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/CallMethodBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/CallMethodBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/CallParamBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/CallParamBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/CallParamBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/CallParamBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/DefaultRulesBinder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java b/core/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java
rename to core/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/DigesterLoadingException.java b/core/src/main/java/org/apache/commons/digester3/binder/DigesterLoadingException.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/DigesterLoadingException.java
rename to core/src/main/java/org/apache/commons/digester3/binder/DigesterLoadingException.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/ErrorMessage.java b/core/src/main/java/org/apache/commons/digester3/binder/ErrorMessage.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/ErrorMessage.java
rename to core/src/main/java/org/apache/commons/digester3/binder/ErrorMessage.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/FactoryCreateBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/FactoryCreateBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/FactoryCreateBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/FactoryCreateBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java b/core/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java
rename to core/src/main/java/org/apache/commons/digester3/binder/FromBinderRuleSet.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/LinkedRuleBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/LinkedRuleBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/LinkedRuleBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/LinkedRuleBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/NodeCreateRuleProvider.java b/core/src/main/java/org/apache/commons/digester3/binder/NodeCreateRuleProvider.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/NodeCreateRuleProvider.java
rename to core/src/main/java/org/apache/commons/digester3/binder/NodeCreateRuleProvider.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/ObjectParamBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/ObjectParamBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/ObjectParamBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/ObjectParamBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/PathCallParamBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/PathCallParamBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/PathCallParamBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/PathCallParamBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/PluginCreateRuleBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/PluginCreateRuleBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/PluginCreateRuleBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/PluginCreateRuleBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/PluginDeclarationRuleBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/PluginDeclarationRuleBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/PluginDeclarationRuleBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/PluginDeclarationRuleBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/RuleProvider.java b/core/src/main/java/org/apache/commons/digester3/binder/RuleProvider.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/RuleProvider.java
rename to core/src/main/java/org/apache/commons/digester3/binder/RuleProvider.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/RulesBinder.java b/core/src/main/java/org/apache/commons/digester3/binder/RulesBinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/RulesBinder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/RulesBinder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/RulesModule.java b/core/src/main/java/org/apache/commons/digester3/binder/RulesModule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/RulesModule.java
rename to core/src/main/java/org/apache/commons/digester3/binder/RulesModule.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/SetNextBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/SetPropertiesBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/SetPropertiesBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/SetPropertiesBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/SetPropertiesBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/SetPropertyBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/SetPropertyBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/SetPropertyBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/SetPropertyBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/SetRootBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java b/core/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java
rename to core/src/main/java/org/apache/commons/digester3/binder/SetTopBuilder.java
diff --git a/src/main/java/org/apache/commons/digester3/binder/package-info.java b/core/src/main/java/org/apache/commons/digester3/binder/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/binder/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/binder/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/package-info.java b/core/src/main/java/org/apache/commons/digester3/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/Declaration.java b/core/src/main/java/org/apache/commons/digester3/plugins/Declaration.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/Declaration.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/Declaration.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/InitializableRule.java b/core/src/main/java/org/apache/commons/digester3/plugins/InitializableRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/InitializableRule.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/InitializableRule.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/LogUtils.java b/core/src/main/java/org/apache/commons/digester3/plugins/LogUtils.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/LogUtils.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/LogUtils.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginAssertionFailure.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginAssertionFailure.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginAssertionFailure.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginAssertionFailure.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginConfigurationException.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginConfigurationException.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginConfigurationException.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginConfigurationException.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginContext.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginContext.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginDeclarationRule.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginException.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginException.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginException.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginException.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginInvalidInputException.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginInvalidInputException.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginInvalidInputException.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginInvalidInputException.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginManager.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginManager.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java b/core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/RuleFinder.java b/core/src/main/java/org/apache/commons/digester3/plugins/RuleFinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/RuleFinder.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/RuleFinder.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/RuleLoader.java b/core/src/main/java/org/apache/commons/digester3/plugins/RuleLoader.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/RuleLoader.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/RuleLoader.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/RulesFactory.java b/core/src/main/java/org/apache/commons/digester3/plugins/RulesFactory.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/RulesFactory.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/RulesFactory.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/package-info.java b/core/src/main/java/org/apache/commons/digester3/plugins/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromClass.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromClass.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromClass.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromClass.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltClass.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltClass.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltClass.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltClass.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltMethod.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltMethod.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltMethod.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltMethod.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltResource.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltResource.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltResource.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromDfltResource.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromFile.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromFile.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromFile.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromFile.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromMethod.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromMethod.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromMethod.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromMethod.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromResource.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromResource.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromResource.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderFromResource.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderSetProperties.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderSetProperties.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/FinderSetProperties.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/FinderSetProperties.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromClass.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromClass.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromClass.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromClass.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromStream.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromStream.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromStream.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderFromStream.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderSetProperties.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderSetProperties.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderSetProperties.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/LoaderSetProperties.java
diff --git a/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/substitution/CompoundSubstitutor.java b/core/src/main/java/org/apache/commons/digester3/substitution/CompoundSubstitutor.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/substitution/CompoundSubstitutor.java
rename to core/src/main/java/org/apache/commons/digester3/substitution/CompoundSubstitutor.java
diff --git a/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java b/core/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java
rename to core/src/main/java/org/apache/commons/digester3/substitution/MultiVariableExpander.java
diff --git a/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java b/core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java
rename to core/src/main/java/org/apache/commons/digester3/substitution/VariableAttributes.java
diff --git a/src/main/java/org/apache/commons/digester3/substitution/VariableExpander.java b/core/src/main/java/org/apache/commons/digester3/substitution/VariableExpander.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/substitution/VariableExpander.java
rename to core/src/main/java/org/apache/commons/digester3/substitution/VariableExpander.java
diff --git a/src/main/java/org/apache/commons/digester3/substitution/VariableSubstitutor.java b/core/src/main/java/org/apache/commons/digester3/substitution/VariableSubstitutor.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/substitution/VariableSubstitutor.java
rename to core/src/main/java/org/apache/commons/digester3/substitution/VariableSubstitutor.java
diff --git a/src/main/java/org/apache/commons/digester3/substitution/package-info.java b/core/src/main/java/org/apache/commons/digester3/substitution/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/substitution/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/substitution/package-info.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/BeanPropertySetterRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/BeanPropertySetterRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/BeanPropertySetterRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/BeanPropertySetterRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/CallMethodRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/CallMethodRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/CallMethodRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/CallMethodRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/FactoryCreateRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/FactoryCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/FactoryCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/FactoryCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/FromXmlRulesModule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/FromXmlRulesModule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/FromXmlRulesModule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/FromXmlRulesModule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/NameSpaceURIRulesBinder.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/NodeCreateRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/NodeCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/NodeCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/NodeCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/ObjectCreateRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/ObjectCreateRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/ObjectCreateRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/ObjectCreateRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/ObjectParamRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/ObjectParamRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/ObjectParamRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/ObjectParamRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/PatternRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/PatternRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/PatternRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/PatternRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/PatternStack.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/PatternStack.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/PatternStack.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/PatternStack.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/PrefixedRulesBinder.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetNamespaceURIRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetNamespaceURIRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetNamespaceURIRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetNamespaceURIRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesAliasRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesAliasRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesAliasRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesAliasRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesIgnoreRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesIgnoreRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesIgnoreRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesIgnoreRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetNestedPropertiesRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesAliasRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesAliasRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesAliasRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesAliasRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertyRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertyRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetPropertyRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertyRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/WithMemoryRulesBinder.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/XmlRulesModule.java
diff --git a/src/main/java/org/apache/commons/digester3/xmlrules/package-info.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/package-info.java
similarity index 100%
rename from src/main/java/org/apache/commons/digester3/xmlrules/package-info.java
rename to core/src/main/java/org/apache/commons/digester3/xmlrules/package-info.java